Merge branch 'master' into frameworks

Conflicts:
	dolphin/src/dolphinmainwindow.cpp
	dolphin/src/dolphinviewcontainer.cpp

1 files changed, 5 insertions, 1 deletions

diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index 200824e0c..4576318bb 100644
--- a/src/dolphinapplication.cpp
+++ b/src/dolphinapplication.cpp
@@ -35,7 +35,6 @@ DolphinApplication::DolphinApplication() :
 
     m_mainWindow = new DolphinMainWindow();
     m_mainWindow->setAttribute(Qt::WA_DeleteOnClose);
-    m_mainWindow->show();
 
     KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
 
@@ -72,6 +71,9 @@ DolphinApplication::DolphinApplication() :
         } else {
             m_mainWindow->openDirectories(urls);
         }
+    } else {
+        const KUrl homeUrl(GeneralSettings::homeUrl());
+        m_mainWindow->openNewActivatedTab(homeUrl);
     }
 
     if (resetSplitSettings) {
@@ -79,6 +81,8 @@ DolphinApplication::DolphinApplication() :
     }
 
     args->clear();
+
+    m_mainWindow->show();
 }
 
 DolphinApplication::~DolphinApplication()