summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2011-10-19 23:14:48 +0200
committerAndrea Diamantini <adjam7@gmail.com>2011-10-19 23:14:48 +0200
commit475cac4d110c57d88c6796583d651cd2ee714fff (patch)
tree7fdf0c79c99f5fa3f051bb819ded337a47dd07b8
parentRemove suggestion when response title is the same as typed text (diff)
parentFix the recover on crash bar which is too big to fit on the screen when rekon... (diff)
downloadrekonq-475cac4d110c57d88c6796583d651cd2ee714fff.tar.xz
Merge branch 'master' of git://anongit.kde.org/rekonq
-rw-r--r--src/application.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/application.cpp b/src/application.cpp
index d770b3d1..39b2af60 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -178,7 +178,6 @@ int Application::newInstance()
if (isRekonqCrashed && isFirstLoad)
{
loadUrl(KUrl("about:closedTabs"), Rekonq::NewWindow);
- mainWindow()->currentTab()->showMessageBar();
}
if (areThereArguments)
@@ -294,6 +293,10 @@ void Application::postLaunch()
instance(), SLOT(loadUrl(const KUrl&, const Rekonq::OpenType&)));
// crash recovering
+ if (ReKonfig::recoverOnCrash())
+ {
+ mainWindow()->currentTab()->showMessageBar();
+ }
ReKonfig::setRecoverOnCrash(ReKonfig::recoverOnCrash() + 1);
saveConfiguration();
}