diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2012-06-20 11:41:08 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2012-06-20 11:43:05 +0200 |
| commit | 91f8f4b5c825c99c77b79fa0cfa692d477760539 (patch) | |
| tree | eb75cc9eeaf865c4b87b63b421a06db56539cc53 | |
| parent | SVN_SILENT made messages (.desktop file) (diff) | |
| download | rekonq-91f8f4b5c825c99c77b79fa0cfa692d477760539.tar.xz | |
Remember to restore all tabs (when needed) also with external arguments
calls (eg: open link with rekonq in konqueror)
WARNING: Needs testing
BUG: 299625
| -rw-r--r-- | src/application.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
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) |