From 901e304376f931d10e9082b5ea919d3cd1cd1250 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 18 Mar 2013 19:30:58 +0100
Subject: Let user decide if session has to be restored or not after crash :)

BUG: 316960
---
 src/application.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/application.cpp')

diff --git a/src/application.cpp b/src/application.cpp
index 696185f9..bf326888 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -194,7 +194,10 @@ int Application::newInstance()
             bool restoreOk = false;
             if (ReKonfig::startupBehaviour() == 2)
             {
-                restoreOk = SessionManager::self()->restoreSessionFromScratch();
+                if (hasToBeRecoveredFromCrash)
+                    restoreOk = false;
+                else
+                    restoreOk = SessionManager::self()->restoreSessionFromScratch();
             }
             else
             {
@@ -288,13 +291,13 @@ int Application::newInstance()
                         loadUrl(KUrl("about:home"), Rekonq::NewPrivateWindow);
                         break;
                     }
-                    if (!SessionManager::self()->restoreSessionFromScratch())
+                    if (hasToBeRecoveredFromCrash || !SessionManager::self()->restoreSessionFromScratch())
                     {
                         loadUrl(KUrl("about:home") , Rekonq::NewTab);
                     }
                     break;
                 default:
-                    newWindow()->tabWidget()->newTab();
+                    ASSERT_NOT_REACHED(unknown startup behavior);
                     break;
                 }
             }
-- 
cgit v1.2.1