comparison main/MainWindow.cpp @ 500:032deed8b35b

Connect quit function directly to closeAllWindows rather than try to closeAllWindows from close() (which strangely hangs on Windows)

     m_rightButtonTransformsMenu(0),
     m_rightButtonPlaybackMenu(0),
     m_soloAction(0),
     m_soloModified(false),
     m_prevSolo(false),
-    m_exiting(false),
     m_rwdStartAction(0),
     m_rwdSimilarAction(0),
     m_rwdAction(0),
     m_ffwdAction(0),
     m_ffwdSimilarAction(0),

     menu->addSeparator();
     action = new QAction(il.load("exit"),
                          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);
 }
 
 void

 }
 
 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;
 	e->ignore();
 	return;
     }
 
     if (!m_abandoning && !checkSaveModified()) {
-//        SVDEBUG << "Ignoring close event" << endl;
+//        std::cerr << "Close refused by user - ignoring close event" << endl;
 	e->ignore();
 	return;
     }
 
     QSettings settings;

 
     closeSession();
 
     e->accept();
 
-    m_exiting = true;
-    qApp->closeAllWindows();
-    
     return;
 }
 
 bool
 MainWindow::commitData(bool mayAskUser)

 	LayerFactory::LayerType type = i->second.layer;
 	
 	LayerFactory::LayerTypeSet emptyTypes =
 	    LayerFactory::getInstance()->getValidEmptyLayerTypes();
 
-	Layer *newLayer;
+	Layer *newLayer = 0;
 
 	if (emptyTypes.find(type) != emptyTypes.end()) {
 
 	    newLayer = m_document->createEmptyLayer(type);
             if (newLayer) {