Mercurial > hg > sonic-visualiser

changeset 576:deabb09d994b sv_v2.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Thu, 16 May 2013 14:16:56 +0100
parents 7941d4f15037 (diff) c8e1c9dcb41a (current diff)
children a866380b3698 31940304272f 85dfb786f9dd a8da6db5a2c9
files .hgsubstate platform-dataquay.pri
diffstat 4 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Thu May 16 14:14:35 2013 +0100
+++ b/.hgsubstate	Thu May 16 14:16:56 2013 +0100
@@ -1,4 +1,4 @@
 7096c7de2d4c327de5e028c33036f146a1884706 dataquay
-489bb1ba12025ace5dc0da53072d24019d158f8d svapp
+8cb01cd2441d1009fce5c1234ecbe033ce45484a svapp
 f85050b6f5229c083f639811aa39a87c8afa7820 svcore
-28973ecd4a555d9f4ac2d5014ea5bbcb0a2445ab svgui
+77fa3fdbfc7e2b9f96eac6524d48294fb47760c3 svgui
--- a/main/MainWindow.cpp	Thu May 16 14:14:35 2013 +0100
+++ b/main/MainWindow.cpp	Thu May 16 14:16:56 2013 +0100
@@ -306,9 +306,9 @@
     
     TransformFactory::getInstance()->startPopulationThread();
 
-    VersionTester *vt = new VersionTester
+    m_versionTester = new VersionTester
         ("sonicvisualiser.org", "/latest-version.txt", SV_VERSION);
-    connect(vt, SIGNAL(newerVersionAvailable(QString)),
+    connect(m_versionTester, SIGNAL(newerVersionAvailable(QString)),
             this, SLOT(newerVersionAvailable(QString)));
 }
 
@@ -319,6 +319,7 @@
     delete m_activityLog;
     delete m_preferencesDialog;
     delete m_layerTreeDialog;
+    delete m_versionTester;
     Profiles::getInstance()->dump();
 //    SVDEBUG << "MainWindow::~MainWindow finishing" << endl;
 }
--- a/main/MainWindow.h	Thu May 16 14:14:35 2013 +0100
+++ b/main/MainWindow.h	Thu May 16 14:16:56 2013 +0100
@@ -60,6 +60,7 @@
 class ActivityLog;
 class QFileSystemWatcher;
 class QScrollArea;
+class VersionTester;
 
 class MainWindow : public MainWindowBase
 {
@@ -245,6 +246,8 @@
 
     QFileSystemWatcher      *m_templateWatcher;
 
+    VersionTester           *m_versionTester;
+
     struct LayerConfiguration {
 	LayerConfiguration(LayerFactory::LayerType _layer
 			                       = LayerFactory::TimeRuler,
--- a/main/main.cpp	Thu May 16 14:14:35 2013 +0100
+++ b/main/main.cpp	Thu May 16 14:16:56 2013 +0100
@@ -445,6 +445,8 @@
 
     delete gui;
 
+    cleanupMutex.unlock();
+
     return rv;
 }