Mercurial > hg > sonic-visualiser

changeset 607:b8f750319cd9 with-dependencies

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Fri, 26 Jul 2013 12:06:59 +0100
parents fa99b4775d35 (diff) 5a240c668b5e (current diff)
children 3aeb7cfadcba
files main/main.cpp
diffstat 2 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Wed Jul 24 12:02:51 2013 +0100
+++ b/.hgsubstate	Fri Jul 26 12:06:59 2013 +0100
@@ -1,5 +1,5 @@
-7096c7de2d4c327de5e028c33036f146a1884706 dataquay
+236814e07bd07473958c1ff89103124536a0c3c8 dataquay
 619f715526df43e23b2b9b50715e825941572352 sv-dependency-builds
 2925a4bbca5e86036d564aaac1bcf7fd11226ca9 svapp
-2f85f0fbf7ab6d67b7c8f79456c76106a0db4785 svcore
+a1bb2989013dc380e3baf6b6e9704520f62b3bc0 svcore
 0aea4b9e4c3dca9c42f9181748bdfde924a8574f svgui
--- a/main/main.cpp	Wed Jul 24 12:02:51 2013 +0100
+++ b/main/main.cpp	Fri Jul 26 12:06:59 2013 +0100
@@ -257,7 +257,7 @@
     signal(SIGINT,  signalHandler);
     signal(SIGTERM, signalHandler);
 
-#ifndef Q_WS_WIN32
+#ifndef Q_OS_WIN32
 //???    signal(SIGHUP,  signalHandler);
 //???    signal(SIGQUIT, signalHandler);
 #endif
@@ -456,8 +456,6 @@
 
     cleanupMutex.unlock();
 
-    cleanupMutex.unlock();
-
     return rv;
 }
 
@@ -484,6 +482,10 @@
 
     MainWindow::FileOpenStatus status = MainWindow::FileOpenFailed;
 
+#ifdef Q_OS_WIN32
+    path.replace("\\", "/");
+#endif
+
     if (path.endsWith("sv")) {
         if (!haveSession) {
             status = m_mainWindow->openSessionFile(path);