From 91f8f4b5c825c99c77b79fa0cfa692d477760539 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Wed, 20 Jun 2012 11:41:08 +0200 Subject: Remember to restore all tabs (when needed) also with external arguments calls (eg: open link with rekonq in konqueror) WARNING: Needs testing BUG: 299625 --- src/application.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/application.cpp') diff --git a/src/application.cpp b/src/application.cpp index 32c4f658..9fa0e322 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -197,8 +197,6 @@ int Application::newInstance() if (isFirstLoad && isSessionRestored()) { isFirstLoad = false; - - return 0; } if (areThereArguments) @@ -227,6 +225,11 @@ int Application::newInstance() } } + if (isFirstLoad && (ReKonfig::startupBehaviour() == 2) && sessionManager()->restoreSessionFromScratch()) + { + isFirstLoad = false; + } + // first argument: 99% of the time we have just that... if (isFirstLoad) { @@ -249,7 +252,8 @@ int Application::newInstance() KWindowSystem::demandAttention(mainWindow()->winId(), true); } - // following arguments: what's best behavior here? I'm pretty sure no one has real opinion here + // following arguments: what's best behavior here? + // I'm pretty sure no one has real opinion about... if (!ReKonfig::openExternalLinksInNewWindow()) { for (int i = 1; i < urlList.count(); ++i) -- cgit v1.2.1