summaryrefslogtreecommitdiff
path: root/src/application.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/application.cpp')
-rw-r--r--src/application.cpp10
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)