Mercurial > hg > svapp

changeset 639:f54722b34c3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix crash on exit when not using OSC (https://sourceforge.net/p/sv1/bugs/263/)
author Chris Cannam
date Wed, 19 Dec 2018 09:29:05 +0000
parents 109a1dd59f45
children fffb78793ca7
files framework/MainWindowBase.cpp
diffstat 1 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/framework/MainWindowBase.cpp	Thu Nov 29 14:25:50 2018 +0000
+++ b/framework/MainWindowBase.cpp	Wed Dec 19 09:29:05 2018 +0000
@@ -328,14 +328,16 @@
     delete m_viewManager;
     delete m_midiInput;
 
-    disconnect(m_oscQueueStarter, 0, 0, 0);
-    m_oscQueueStarter->wait(1000);
-    if (m_oscQueueStarter->isRunning()) {
-        m_oscQueueStarter->terminate();
+    if (m_oscQueueStarter) {
+        disconnect(m_oscQueueStarter, 0, 0, 0);
         m_oscQueueStarter->wait(1000);
+        if (m_oscQueueStarter->isRunning()) {
+            m_oscQueueStarter->terminate();
+            m_oscQueueStarter->wait(1000);
+        }
+        delete m_oscQueueStarter;
+        delete m_oscQueue;
     }
-    delete m_oscQueueStarter;
-    delete m_oscQueue;
     
     Profiles::getInstance()->dump();
 }