KDE/kdevplatform/shell

[Andreas Pakulat]

SVN commit 814626 by apaku:

Unbreak Proper shell shutdown sequence, r803400 introduced complete breakage of this by calling QApplication::exit().

To everyone: NEVER EVER break the shutdown sequence of doing Core::cleanup and then deleting core. This is now done by the last mainwindow that is closed (and during application shutdown all mainwindows are closed via KApplication::closeAllWindows())

CCMAIL:kdevelop-devel at kdevelop.org


 M  +2 -3      mainwindow.cpp  
 M  +4 -2      mainwindow_actions.cpp  


--- trunk/KDE/kdevplatform/shell/mainwindow.cpp #814625:814626
@@ -167,9 +167,8 @@
 
 bool MainWindow::queryClose()
 {
-    if (!d->applicationQuitRequested())
-        if (!Core::self()->documentControllerInternal()->saveAllDocumentsForWindow(this, IDocument::Default))
-            return false;
+    if (!Core::self()->documentControllerInternal()->saveAllDocumentsForWindow(this, IDocument::Default))
+        return false;
 
     return Sublime::MainWindow::queryClose();
 }
--- trunk/KDE/kdevplatform/shell/mainwindow_actions.cpp #814625:814626
@@ -199,9 +199,11 @@
 {
     s_quitRequested = true;
 
-    if (Core::self()->documentController()->saveAllDocuments(IDocument::Default))
-        return qApp->exit();
+    QApplication::closeAllWindows();
 
+    //if (Core::self()->documentController()->saveAllDocuments(IDocument::Default))
+    //    return qApp->exit();
+
     s_quitRequested = false;
 }