Fix saving window state when closing app with Ctrl+Q shortcut

Closes #2444
QupZilla · Dec 3, 2017 · 0cd15ad · 0cd15ad
1 parent 69953fa
commit 0cd15ad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/lib/app/browserwindow.cpp b/src/lib/app/browserwindow.cpp
@@ -1342,6 +1342,7 @@ void BrowserWindow::keyReleaseEvent(QKeyEvent* event)
 void BrowserWindow::closeEvent(QCloseEvent* event)
 {
     if (mApp->isClosing()) {
+        saveSettings();
         return;
     }
 

diff --git a/src/lib/app/mainapplication.cpp b/src/lib/app/mainapplication.cpp
@@ -684,6 +684,10 @@ void MainApplication::quitApplication()
 
     m_isClosing = true;
 
+    for (BrowserWindow *window : qAsConst(m_windows)) {
+        window->close();
+    }
+
     // Saving settings in saveSettings() slot called from quit() so
     // everything gets saved also when quitting application in other
     // way than clicking Quit action in File menu or closing last window
-Original file line number
+Diff line change
@@ Expand Up / @@ -1342,6 +1342,7 @@ void BrowserWindow::keyReleaseEvent(QKeyEvent* event) @@
     void BrowserWindow::closeEvent(QCloseEvent* event)
     {
         if (mApp->isClosing()) {
+            saveSettings();
             return;
         }
@@ Expand Down @@