Merge tag 'upstream/3.0.0'

Upstream version 3.0.0

# gpg: Signature made Sun 14 Dec 2014 08:24:31 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, 3 insertions, 0 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp b/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp
index c53d95c..df8799b 100644
--- a/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp
@@ -520,7 +520,10 @@ MdiWindow* MainWindow::restoreWindowSession(const QVariant &windowSessions)
     // Add the window to MDI area and restore its session
     MdiWindow* window = ui->mdiArea->addSubWindow(mdiChild);
     if (!window->restoreSession(winSessionHash))
+    {
+        window->setCloseWithoutSessionSaving(true);
         delete window;
+    }
 
     return window;
 }