Merge branch 'release/20.08' into master

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 2b2674f9d97dceb34f9e8f8ae24f3be40cd61da4..8b3121d220a801b6f825d61c6ce026a74b5006e1 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,23 +1,10 @@
-/***************************************************************************
- *   Copyright (C) 2006 by Peter Penz <peter.penz19@gmail.com>             *
- *   Copyright (C) 2006 by Stefan Monov <logixoul@gmail.com>               *
- *   Copyright (C) 2015 by Mathieu Tarral <mathieu.tarral@gmail.com>       *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
- ***************************************************************************/
+/*
+ * SPDX-FileCopyrightText: 2006 Peter Penz <peter.penz19@gmail.com>
+ * SPDX-FileCopyrightText: 2006 Stefan Monov <logixoul@gmail.com>
+ * SPDX-FileCopyrightText: 2015 Mathieu Tarral <mathieu.tarral@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
 #include "dbusinterface.h"
 #include "dolphin_generalsettings.h"
@@ -31,6 +18,7 @@
 #include <KDBusService>
 #include <KLocalizedString>
 #include <Kdelibs4ConfigMigrator>
+#include <KConfigGui>
 
 #include <QApplication>
 #include <QCommandLineParser>
@@ -139,10 +127,14 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
     const bool openFiles = parser.isSet(QStringLiteral("select"));
     const QStringList args = parser.positionalArguments();
     QList<QUrl> urls = Dolphin::validateUris(args);
+    // We later mutate urls, so we need to store if it was empty originally
+    const bool startedWithURLs = !urls.isEmpty();
+
 
     if (parser.isSet(QStringLiteral("daemon"))) {
         KDBusService dolphinDBusService;
         DBusInterface interface;
+        interface.setAsDaemon();
         return app.exec();
     }
 
@@ -153,7 +145,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
         }
     }
 
-    if (urls.isEmpty()) {
+    if (!startedWithURLs) {
         // We need at least one URL to open Dolphin
         urls.append(Dolphin::homeUrl());
     }
@@ -173,17 +165,30 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
 
     mainWindow->show();
 
-    if (app.isSessionRestored()) {
-        const QString className = KXmlGuiWindow::classNameOfToplevel(1);
-        if (className == QLatin1String("DolphinMainWindow")) {
-            mainWindow->restore(1);
-        } else {
-           qCWarning(DolphinDebug) << "Unknown class " << className << " in session saved data!";
-        }
-    }
-
     KDBusService dolphinDBusService;
     DBusInterface interface;
 
+    if (!app.isSessionRestored()) {
+        KConfigGui::setSessionConfig(QStringLiteral("dolphin"), QStringLiteral("dolphin"));
+    }
+
+    // Only restore session if:
+    // 1. Dolphin was not started with command line args
+    // 2. The "remember state" setting is enabled or session restoration after
+    //    reboot is in use
+    // 3. There is a session available to restore
+    if (!startedWithURLs && (app.isSessionRestored() || GeneralSettings::rememberOpenedTabs()) ) {
+        // Get saved state data for the last-closed Dolphin instance
+        const QString serviceName = QStringLiteral("org.kde.dolphin-%1").arg(QCoreApplication::applicationPid());
+        if (Dolphin::dolphinGuiInstances(serviceName).size() > 0) {
+            const QString className = KXmlGuiWindow::classNameOfToplevel(1);
+            if (className == QLatin1String("DolphinMainWindow")) {
+                mainWindow->restore(1);
+            } else {
+                qCWarning(DolphinDebug) << "Unknown class " << className << " in session saved data!";
+            }
+        }
+    }
+
     return app.exec(); // krazy:exclude=crash;
 }