]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Don't unset XDG_ACTIVATION_TOKEN manually
authorKai Uwe Broulik <kde@privat.broulik.de>
Wed, 23 Jul 2025 10:57:30 +0000 (12:57 +0200)
committerMéven Car <meven@kde.org>
Wed, 23 Jul 2025 11:55:39 +0000 (11:55 +0000)
If we didn't attach to an existing instance, we call QWindow::show() on
our MainWindow which requires the token. Upon successful attachment
to another instance we exit anyway.

src/main.cpp

index 5ddef13d4dd670bd6956a2ca68f6c43eca6d59ca..4a346943b112da7c4133ec6c93c9e5e08602de25 100644 (file)
@@ -187,7 +187,6 @@ int main(int argc, char **argv)
         QString token;
         if (KWindowSystem::isPlatformWayland()) {
             token = qEnvironmentVariable("XDG_ACTIVATION_TOKEN");
         QString token;
         if (KWindowSystem::isPlatformWayland()) {
             token = qEnvironmentVariable("XDG_ACTIVATION_TOKEN");
-            qunsetenv("XDG_ACTIVATION_TOKEN");
         } else if (KWindowSystem::isPlatformX11()) {
 #if HAVE_X11
             token = QX11Info::nextStartupId();
         } else if (KWindowSystem::isPlatformX11()) {
 #if HAVE_X11
             token = QX11Info::nextStartupId();