Fix Wayland window activation when attaching to an existing instance

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 017a31f1d0dbdaba27d2245027671ad21517997d..9da0c6fe81d5381dc70a67e19a0bc688399802af 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -23,6 +23,7 @@
 #include <KLocalizedString>
 #include <KConfigGui>
 #include <KIO/PreviewJob>
 #include <KLocalizedString>
 #include <KConfigGui>
 #include <KIO/PreviewJob>

+#include <KWindowSystem>

 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <Kdelibs4ConfigMigrator>
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <Kdelibs4ConfigMigrator>


@@ -175,7 +176,14 @@ int main(int argc, char **argv)
     }
 
     if (!parser.isSet(QStringLiteral("new-window"))) {
     }
 
     if (!parser.isSet(QStringLiteral("new-window"))) {

-        if (Dolphin::attachToExistingInstance(urls, openFiles, splitView)) {
+
+        QString token;
+        if (KWindowSystem::isPlatformWayland()) {
+            token = qEnvironmentVariable("XDG_ACTIVATION_TOKEN");
+            qunsetenv("XDG_ACTIVATION_TOKEN");
+        }
+
+        if (Dolphin::attachToExistingInstance(urls, openFiles, splitView, QString(), token)) {

             // Successfully attached to existing instance of Dolphin
             return 0;
         }
             // Successfully attached to existing instance of Dolphin
             return 0;
         }