File Make-konqueror-open-a-window-even-if-already-ru... of Package konqueror

Overview Repositories Revisions Requests Users Attributes Meta

File Make-konqueror-open-a-window-even-if-already-running.patch of Package konqueror

From bebc1972900db5fe93942034ea9897566d952def Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Mon, 27 Apr 2020 22:27:18 +0200
Subject: Make `konqueror` open a window even if already running.

BUG: 388333
FIXED-IN: 20.04.1
---
 src/konqmain.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/konqmain.cpp b/src/konqmain.cpp
index 901f9ab..ab95366 100644
--- a/src/konqmain.cpp
+++ b/src/konqmain.cpp
@@ -83,16 +83,21 @@ static KonqMainWindow* handleCommandLine(QCommandLineParser &parser, const QStri
         return nullptr;
     }
 
+    const bool firstStart = !KonqMainWindow::mainWindowList();
+
     // Ask the user to recover session if applicable
     KonqSessionManager::self()->askUserToRestoreAutosavedAbandonedSessions();
 
     if (args.isEmpty()) {
         // No args. If --silent, do nothing, otherwise create a default window.
         if (!parser.isSet("silent")) {
-            // If session recovery created some windows, no need for an empty window here.
-            QList<KonqMainWindow *> *mainWindowList = KonqMainWindow::mainWindowList();
-            if (mainWindowList && !mainWindowList->isEmpty()) {
-                return mainWindowList->at(0);
+            // #388333
+            if (firstStart) {
+                // If session recovery created some windows, no need for an empty window here.
+                QList<KonqMainWindow *> *mainWindowList = KonqMainWindow::mainWindowList();
+                if (mainWindowList && !mainWindowList->isEmpty()) {
+                    return mainWindowList->at(0);
+                }
             }
 
             KonqMainWindow *mainWin = KonqMainWindowFactory::createNewWindow();
-- 
cgit v1.1

Places

File Make-konqueror-open-a-window-even-if-already-running.patch of Package konqueror

Places