# HG changeset patch
# User Chris Cannam
# Date 1407964531 -3600
# Node ID 7831f08e8f4f4d9a4f39a029d36581e1bc739ea6
# Parent  91d821455fa55a277414f94c72657b8bef842724# Parent  dc8270ceb8fc61eef0defc15ffb8456f28619f7c
Merge from default branch

diff -r dc8270ceb8fc -r 7831f08e8f4f .hgsubstate
--- a/.hgsubstate	Wed Aug 13 22:03:19 2014 +0100
+++ b/.hgsubstate	Wed Aug 13 22:15:31 2014 +0100
@@ -1,5 +1,5 @@
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
 879bdc878826bebec67130326f99397c430419b1 sv-dependency-builds
-f747be6743ab92889ead8e57df90a6d352b56a74 svapp
+7373a8c262cadf25d1da60a8ec3301a17ddff35b svapp
 f5810f1270ae64d2a814c55f7d56cc7cfe11192b svcore
 57d943a6194318315d96bc2b2c81af47cfeda9e3 svgui
diff -r dc8270ceb8fc -r 7831f08e8f4f main/MainWindow.cpp
--- a/main/MainWindow.cpp	Wed Aug 13 22:03:19 2014 +0100
+++ b/main/MainWindow.cpp	Wed Aug 13 22:15:31 2014 +0100
@@ -162,7 +162,9 @@
     m_layerTreeDialog(0),
     m_activityLog(new ActivityLog()),
     m_keyReference(new KeyReference()),
-    m_templateWatcher(0)
+    m_templateWatcher(0),
+    m_surveyer(0),
+    m_versionTester(0)
 {
     Profiler profiler("MainWindow::MainWindow");
 
@@ -301,6 +303,16 @@
     connect(m_midiInput, SIGNAL(eventsAvailable()),
             this, SLOT(midiEventsAvailable()));
 
+#ifdef BETA_RELEASE
+    QMessageBox::information
+        (this, tr("Test release"),
+         tr("<p>This is a test release of %1.</p>"
+            "<p>See the <a href=\"http://code.soundsoftware.ac.uk/projects/sonic-visualiser/repository/entry/CHANGELOG\">changelog</a> for details of what has changed since the last release.</p>"
+            "<p>Please let us know if you have any problems with this test release, and especially if it crashes. Use the <a href=\"http://sourceforge.net/p/sv1/bugs/\">bug tracker</a> or <a href=\"mailto:cannam+sv@all-day-breakfast.com\">email</a> to report bugs.</p><p>Please do not use this software for real work, and do not distribute it to other people who have real work to do! Use it only if you are prepared to report any bugs you find.</p>")
+         .arg(QApplication::applicationName()));
+
+    (void)withOSCSupport; // avoid warning
+#else
     NetworkPermissionTester tester;
     bool networkPermission = tester.havePermission();
     if (networkPermission) {
@@ -314,10 +326,8 @@
             ("sonicvisualiser.org", "latest-version.txt", SV_VERSION);
         connect(m_versionTester, SIGNAL(newerVersionAvailable(QString)),
                 this, SLOT(newerVersionAvailable(QString)));
-    } else {
-        m_surveyer = 0;
-        m_versionTester = 0;
     }
+#endif
 }
 
 MainWindow::~MainWindow()
diff -r dc8270ceb8fc -r 7831f08e8f4f version.h
--- a/version.h	Wed Aug 13 22:03:19 2014 +0100
+++ b/version.h	Wed Aug 13 22:15:31 2014 +0100
@@ -1,1 +1,1 @@
-#define SV_VERSION "2.4"
+#define SV_VERSION "2.3.9"