The &-shortcut from another action is not set until the action has been shown at...

[dolphin.git] / src / dolphinapplication.cpp

diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index c418f4540d086a4ae45536625c18301215bb0925..8b6139d925257bbe3ab9118acb4d4119baec7d7b 100644 (file)
--- a/src/dolphinapplication.cpp
+++ b/src/dolphinapplication.cpp
@@ -72,23 +72,27 @@ void DolphinApplication::refreshMainWindows()
 int DolphinApplication::newInstance()
 {
     KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
 int DolphinApplication::newInstance()
 {
     KCmdLineArgs* args = KCmdLineArgs::parsedArgs();

+    static bool first = true;

 
 

-    QList<KUrl> urls;

     const int argsCount = args->count();
     const int argsCount = args->count();

-    for (int i = 0; i < argsCount; ++i) {
-        urls.append(args->url(i));
-    }
+    if ((argsCount > 0) || !first || !isSessionRestored()) {
+        QList<KUrl> urls;
+        for (int i = 0; i < argsCount; ++i) {
+            urls.append(args->url(i));
+        }

 
 

-    DolphinMainWindow* win = createMainWindow();
-    if (urls.count() > 0) {
-        if (args->isSet("select")) {
-            win->openFiles(urls);
-        } else {
-            win->openDirectories(urls);
+        DolphinMainWindow* win = createMainWindow();
+        if (urls.count() > 0) {
+            if (args->isSet("select")) {
+                win->openFiles(urls);
+            } else {
+                win->openDirectories(urls);
+            }

         }
         }

+        win->show();

     }
     }

-    win->show();

 
 

+    first = false;

     args->clear();
     return 0;
 }
     args->clear();
     return 0;
 }