# HG changeset patch
# User Chris Cannam
# Date 1327942638 0
# Node ID d09a396cde80b3eeb0ffd504f74b2a8fccdbc778
# Parent  173325440b8e4a281f3f8b56570f5e61a1ac1e2e# Parent  44ab626bb8666837e90eef29aa6dbcd361be2b77
Merge

diff -r 44ab626bb866 -r d09a396cde80 main/MainWindow.cpp
--- a/main/MainWindow.cpp	Mon Jan 30 16:39:40 2012 +0000
+++ b/main/MainWindow.cpp	Mon Jan 30 16:57:18 2012 +0000
@@ -149,7 +149,6 @@
     m_soloAction(0),
     m_soloModified(false),
     m_prevSolo(false),
-    m_exiting(false),
     m_rwdStartAction(0),
     m_rwdSimilarAction(0),
     m_rwdAction(0),
@@ -576,7 +575,7 @@
                          tr("&Quit"), this);
     action->setShortcut(tr("Ctrl+Q"));
     action->setStatusTip(tr("Exit Sonic Visualiser"));
-    connect(action, SIGNAL(triggered()), this, SLOT(close()));
+    connect(action, SIGNAL(triggered()), qApp, SLOT(closeAllWindows()));
     m_keyReference->registerShortcut(action);
     menu->addAction(action);
 }
@@ -3038,12 +3037,7 @@
 void
 MainWindow::closeEvent(QCloseEvent *e)
 {
-    if (m_exiting) {
-        e->accept();
-        return;
-    }
-
-//    SVDEBUG << "MainWindow::closeEvent" << endl;
+//    std::cerr << "MainWindow::closeEvent" << std::endl;
 
     if (m_openingAudioFile) {
 //        std::cerr << "Busy - ignoring close event" << std::endl;
@@ -3052,7 +3046,7 @@
     }
 
     if (!m_abandoning && !checkSaveModified()) {
-//        SVDEBUG << "Ignoring close event" << endl;
+//        std::cerr << "Close refused by user - ignoring close event" << endl;
 	e->ignore();
 	return;
     }
@@ -3076,9 +3070,6 @@
 
     e->accept();
 
-    m_exiting = true;
-    qApp->closeAllWindows();
-    
     return;
 }
 
diff -r 44ab626bb866 -r d09a396cde80 main/MainWindow.h
--- a/main/MainWindow.h	Mon Jan 30 16:39:40 2012 +0000
+++ b/main/MainWindow.h	Mon Jan 30 16:57:18 2012 +0000
@@ -230,8 +230,6 @@
     bool                     m_soloModified;
     bool                     m_prevSolo;
 
-    bool                     m_exiting;
-
     QFrame                  *m_playControlsSpacer;
     int                      m_playControlsWidth;
 
diff -r 44ab626bb866 -r d09a396cde80 sonic-visualiser.pro
--- a/sonic-visualiser.pro	Mon Jan 30 16:39:40 2012 +0000
+++ b/sonic-visualiser.pro	Mon Jan 30 16:57:18 2012 +0000
@@ -25,9 +25,9 @@
 
 LIBS = -L../svapp -L../svgui -L../svcore -lsvapp -lsvgui -lsvcore $$LIBS
 
-PRE_TARGETDEPS += ../svapp/libsvapp.a \
-                  ../svgui/libsvgui.a \
-                  ../svcore/libsvcore.a
+PRE_TARGETDEPS += ../svapp/svapp.lib \
+                  ../svgui/svgui.lib \
+                  ../svcore/svcore.lib
 
 RESOURCES += sonic-visualiser.qrc