File fix-extra-window-when-restored-by-session-manag... of Package konsole

Overview Repositories Revisions Requests Users Attributes Meta

File fix-extra-window-when-restored-by-session-management.patch of Package konsole (Revision 39dde7d91520d7ab402ad711cb9ff108)

Currently displaying revision 39dde7d91520d7ab402ad711cb9ff108 , Show latest

From: Kurt Hindenburg <kurt.hindenburg@gmail.com>
Date: Sun, 28 Aug 2016 13:08:02 +0000
Subject: Prevent 2 windows from opening upon session restore
X-Git-Url: http://quickgit.kde.org/?p=konsole.git&a=commitdiff&h=5b11fd593b954504343bdb418c54a8e7913d9c7c
---
Prevent 2 windows from opening upon session restore

Session management would start 2 konsole windows upon login.

Thanks John Stanley (jpsinthemix gmail com) for patch

BUG: 367447
---

--- a/src/main.cpp
+++ b/src/main.cpp
@@ -158,14 +158,13 @@
     // of Konsole is started.
     QObject::connect(&dbusService, &KDBusService::activateRequested, &konsoleApp, &Application::slotActivateRequested);
 
-    if (!konsoleApp.newInstance()) {
+    if (app->isSessionRestored()) {
+        restoreSession(konsoleApp);
+    } else if (!konsoleApp.newInstance()) {
         // An argument that printed something and mean we should just quit was passed.
         delete app;
         return 0;
     }
-
-    if (app->isSessionRestored())
-        restoreSession(konsoleApp);
 
     // Since we've allocated the QApplication on the heap for the KDBusService workaround,
     // we need to delete it manually before returning from main().

Places

File fix-extra-window-when-restored-by-session-management.patch of Package konsole (Revision 39dde7d91520d7ab402ad711cb9ff108)

Places