summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Rohrbach <fxrh@gmx.de>2011-03-21 23:40:27 +0100
committerFelix Rohrbach <fxrh@gmx.de>2011-03-23 00:34:53 +0100
commit71e6452121f955d48fd3065e06d3a8185b24fe23 (patch)
treeb2292ca4a82f2db321a7a4657161238378f70245
parentBetter color integration for the urlbar and the findbar (diff)
downloadrekonq-71e6452121f955d48fd3065e06d3a8185b24fe23.tar.xz
Make rekonq open a new window when called, even if it's already running.
Reviewed by Andrea Diamantini. BUG: 269065
-rw-r--r--src/application.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/application.cpp b/src/application.cpp
index b1712d3e..3c1223a9 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -110,6 +110,8 @@ int Application::newInstance()
bool isFirstLoad = m_mainWindows.isEmpty();
bool areThereArguments = (args->count() > 0);
bool isRekonqCrashed = ReKonfig::recoverOnCrash();
+ // note that isRekonqCrashed is always true if it is not the first load
+ // !isFirstLoad -> isRekonqCrashed
kDebug() << "is first load? " << isFirstLoad;
kDebug() << "are there arguments? " << areThereArguments;
@@ -166,10 +168,10 @@ int Application::newInstance()
KStartupInfo::appStarted();
}
- else if (!isRekonqCrashed)
+ else
{
- if (isFirstLoad) // we are starting rekonq, for the first time with no args: use startup behaviour
+ if (isFirstLoad && !isRekonqCrashed) // we are starting rekonq, for the first time with no args: use startup behaviour
{
switch (ReKonfig::startupBehaviour())
{