summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2011-03-09 17:33:45 +0100
committerAndrea Diamantini <adjam7@gmail.com>2011-03-09 17:33:45 +0100
commit8b62f205b28dd9d4baf07bdce622c01a884097db (patch)
treef84266aed1f222a898bfe80f23ec65c361e19eb8
parentMerge branch 'master' of git.kde.org:rekonq (diff)
downloadrekonq-8b62f205b28dd9d4baf07bdce622c01a884097db.tar.xz
This is a first commit fixing the "dangerous" changes introduced to fix
bug 266837. We basically have now a mainWindow() slot widely used in rekonq, that can return a null pointer. Checking the code again to ensure this is the unique bug caused by the change... BUG:268023
-rw-r--r--src/application.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/application.cpp b/src/application.cpp
index 5867211f..7b8fa90b 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -146,7 +146,7 @@ int Application::newInstance()
{
// No windows in the current desktop? No windows at all?
// Create a new one and load there sites...
- loadUrl(urlList.at(0), Rekonq::CurrentTab);
+ loadUrl(urlList.at(0), Rekonq::NewWindow);
}
else
{