From fba2312780dd712fff036c3926320d1ceba2adbc Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 5 Mar 2010 01:04:28 +0100
Subject: Fixing recover on crash hackish fix :(

---
 src/application.cpp | 11 ++++++++++-
 src/rekonq.kcfg     |  3 +++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/application.cpp b/src/application.cpp
index 270cd87f..499c7a37 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -79,6 +79,11 @@ Application::Application()
 
 Application::~Application()
 {
+    // ok, we are closing well.
+    // Don't recover on next load..
+    ReKonfig::setRecoverOnCrash(false);
+    saveConfiguration();
+    
     foreach( QWeakPointer<MainWindow> window, m_mainWindows)
     {
         delete window.data();
@@ -143,7 +148,7 @@ int Application::newInstance()
     // is your app session restored? restore session...
     // this mechanism also falls back to load usual plain rekonq
     // if something goes wrong...
-    if (isSessionRestored() && sessionManager()->restoreSession())
+    if (ReKonfig::recoverOnCrash() && sessionManager()->restoreSession())
     {
         kDebug() << "session restored";
         return 1;
@@ -198,6 +203,10 @@ void Application::postLaunch()
     // bookmarks loading
     connect(Application::bookmarkProvider(), SIGNAL(openUrl(const KUrl&, const Rekonq::OpenType&)),
             Application::instance(), SLOT(loadUrl(const KUrl&, const Rekonq::OpenType&)));
+
+    // crash recovering
+    ReKonfig::setRecoverOnCrash(true);
+    saveConfiguration();
 }
 
 
diff --git a/src/rekonq.kcfg b/src/rekonq.kcfg
index 0675720c..f68dc7e8 100644
--- a/src/rekonq.kcfg
+++ b/src/rekonq.kcfg
@@ -25,6 +25,9 @@
     <entry name="walletBlackList" type="StringList">
         <default></default>
     </entry>
+    <entry name="recoverOnCrash" type="bool">
+        <default>false</default>
+    </entry>
 </group>
 
 <!-- New Tab Page Settings -->
-- 
cgit v1.2.1