Merge tag 'upstream/3.0.1'

Upstream version 3.0.1

# gpg: Signature made Tue 30 Dec 2014 12:06:57 AM EST using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"

1 files changed, 24 insertions, 18 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp b/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp
index df8799b..7dbde8c 100644
--- a/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp
@@ -420,17 +420,20 @@ void MainWindow::saveSession(MdiWindow* currWindow)
     sessionValue["state"] = saveState();
     sessionValue["geometry"] = saveGeometry();
 
-    QList<QVariant> windowSessions;
-    foreach (MdiWindow* window, ui->mdiArea->getWindows())
-        if (window->restoreSessionNextTime())
-            windowSessions << window->saveSession();
-
-    sessionValue["windowSessions"] = windowSessions;
-
-    if (currWindow && currWindow->restoreSessionNextTime())
+    if (CFG_UI.General.RestoreSession.get())
     {
-        QString title = currWindow->windowTitle();
-        sessionValue["activeWindowTitle"] = title;
+        QList<QVariant> windowSessions;
+        foreach (MdiWindow* window, ui->mdiArea->getWindows())
+            if (window->restoreSessionNextTime())
+                windowSessions << window->saveSession();
+
+        sessionValue["windowSessions"] = windowSessions;
+
+        if (currWindow && currWindow->restoreSessionNextTime())
+        {
+            QString title = currWindow->windowTitle();
+            sessionValue["activeWindowTitle"] = title;
+        }
     }
 
     sessionValue["dbTree"] = dbTree->saveSession();
@@ -457,15 +460,18 @@ void MainWindow::restoreSession()
     if (sessionValue.contains("dbTree"))
         dbTree->restoreSession(sessionValue["dbTree"]);
 
-    if (sessionValue.contains("windowSessions"))
-        restoreWindowSessions(sessionValue["windowSessions"].toList());
-
-    if (sessionValue.contains("activeWindowTitle"))
+    if (CFG_UI.General.RestoreSession.get())
     {
-        QString title = sessionValue["activeWindowTitle"].toString();
-        MdiWindow* window = ui->mdiArea->getWindowByTitle(title);
-        if (window)
-            ui->mdiArea->setActiveSubWindow(window);
+        if (sessionValue.contains("windowSessions"))
+            restoreWindowSessions(sessionValue["windowSessions"].toList());
+
+        if (sessionValue.contains("activeWindowTitle"))
+        {
+            QString title = sessionValue["activeWindowTitle"].toString();
+            MdiWindow* window = ui->mdiArea->getWindowByTitle(title);
+            if (window)
+                ui->mdiArea->setActiveSubWindow(window);
+        }
     }
 
     if (statusField->hasMessages())