From 29e891b3b146540d69a6377f1a557b246e8b8c68 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Mon, 24 Sep 2012 17:47:01 +0200 Subject: rekonq new tab page restored :) --- src/application.cpp | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) (limited to 'src/application.cpp') diff --git a/src/application.cpp b/src/application.cpp index da87063d..c36ea441 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -179,33 +179,26 @@ int Application::newInstance() { if (isFirstLoad) { - if (hasToBeRecoveredFromCrash) + // NOTE: just load new tabs/windows without arguments + // if NOT is Session restored... + if (!isSessionRestored()) { - loadUrl(KUrl("about:closedTabs"), Rekonq::NewWindow); - } - else - { - // NOTE: just load new tabs/windows without arguments - // if NOT is Session restored... - if (!isSessionRestored()) + switch (ReKonfig::startupBehaviour()) { - switch (ReKonfig::startupBehaviour()) + case 0: // open home page + loadUrl(KUrl(ReKonfig::homePage()) , Rekonq::NewWindow); + break; + case 1: // open new tab page + loadUrl(KUrl("about:home"), Rekonq::NewWindow); + break; + case 2: // restore session + if (SessionManager::self()->restoreSessionFromScratch()) { - case 0: // open home page - newTabWindow()->newCleanTab(); - break; - case 1: // open new tab page - loadUrl(KUrl("about:home"), Rekonq::NewWindow); - break; - case 2: // restore session - if (SessionManager::self()->restoreSessionFromScratch()) - { - break; - } - default: - newTabWindow()->newCleanTab(); break; } + default: + newTabWindow()->newCleanTab(); + break; } } } -- cgit v1.2.1