Mercurial > hg > sonic-visualiser
changeset 2342:175ece418988
Merge from branch time-frequency-boxes
author | Chris Cannam |
---|---|
date | Mon, 07 Oct 2019 09:36:11 +0100 |
parents | f670b7653f8e (current diff) 1e77e4ee27f5 (diff) |
children | b35d9a313f38 |
files | repoint-lock.json |
diffstat | 3 files changed, 13 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- 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(); }
--- 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); }
--- 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"