# HG changeset patch
# User Chris Cannam
# Date 1570437371 -3600
# Node ID 175ece418988505e0fe63a7cd3d7d4364238e5fb
# Parent  f670b7653f8eae437fb391aedb100c7c10b46ffa# Parent  1e77e4ee27f57a23547cc5b141d36b5169a02582
Merge from branch time-frequency-boxes

diff -r f670b7653f8e -r 175ece418988 main/OSCHandler.cpp
--- a/main/OSCHandler.cpp	Mon Oct 07 09:32:50 2019 +0100
+++ b/main/OSCHandler.cpp	Mon Oct 07 09:36:11 2019 +0100
@@ -426,7 +426,8 @@
                 m_viewManager->setZoomWheelsEnabled(value > 0.5);
             } else if (property == "propertyboxes") {
                 bool toggle = ((value < 0.5) !=
-                               (m_paneStack->getLayoutStyle() == PaneStack::NoPropertyStacks));
+                               (m_paneStack->getLayoutStyle() ==
+                                PaneStack::HiddenPropertyStacksLayout));
                 if (toggle) togglePropertyBoxes();
             }
                 
diff -r f670b7653f8e -r 175ece418988 main/main.cpp
--- a/main/main.cpp	Mon Oct 07 09:32:50 2019 +0100
+++ b/main/main.cpp	Mon Oct 07 09:36:11 2019 +0100
@@ -188,12 +188,15 @@
     // Avoid this happening more than once across threads
 
     cerr << "signalHandler: cleaning up and exiting" << endl;
-    cleanupMutex.lock();
-    if (!cleanedUp) {
-        TempDirectory::getInstance()->cleanup();
-        cleanedUp = true;
+
+    if (cleanupMutex.tryLock(5000)) {
+        if (!cleanedUp) {
+            TempDirectory::getInstance()->cleanup();
+            cleanedUp = true;
+        }
+        cleanupMutex.unlock();
     }
-    cleanupMutex.unlock();
+    
     exit(0);
 }
 
diff -r f670b7653f8e -r 175ece418988 repoint-lock.json
--- a/repoint-lock.json	Mon Oct 07 09:32:50 2019 +0100
+++ b/repoint-lock.json	Mon Oct 07 09:36:11 2019 +0100
@@ -4,13 +4,13 @@
       "pin": "0b6802e3b755"
     },
     "svcore": {
-      "pin": "71e97de5053f"
+      "pin": "13bd41bd8a17"
     },
     "svgui": {
-      "pin": "d5ef91dc2ea7"
+      "pin": "88fcbc4d93dd"
     },
     "svapp": {
-      "pin": "3e930ea94db6"
+      "pin": "8e9702c0b9c7"
     },
     "checker": {
       "pin": "c8c17e51aab0"