X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/5be69f0daba256cd3faad0aaa16dee8447a76af4..579eadeb6ddffb03e8043090a330c6dba0717299:/src/dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index e4aa16d5f..9f021684c 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -289,7 +289,7 @@ void DolphinMainWindow::activateWindow(const QString &activationToken)
     if (KWindowSystem::isPlatformWayland()) {
         KWindowSystem::setCurrentXdgActivationToken(activationToken);
     } else {
-        KStartupInfo::setNewStartupId(window()->windowHandle(), KStartupInfo::startupId());
+        KStartupInfo::setNewStartupId(window()->windowHandle(), activationToken.toUtf8());
     }
 
     KWindowSystem::activateWindow(window()->windowHandle());
@@ -1705,7 +1705,6 @@ void DolphinMainWindow::setupActions()
         "</para>"));
     toggleSelectionModeAction->setIcon(QIcon::fromTheme(QStringLiteral("quickwizard")));
     toggleSelectionModeAction->setCheckable(true);
-    actionCollection()->setDefaultShortcut(toggleSelectionModeAction, Qt::Key_Space );
     connect(toggleSelectionModeAction, &QAction::triggered, this, &DolphinMainWindow::toggleSelectionMode);
 
     // A special version of the toggleSelectionModeAction for the toolbar that also contains a menu
@@ -2343,6 +2342,8 @@ void DolphinMainWindow::refreshViews()
         updateWindowTitle();
     }
 
+    updateSplitAction();
+
     Q_EMIT settingsChanged();
 }