Changed shortcut, but need to fix async conditions

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 30498952ca09cde714a8c447fd9fb50dbb52c273..ea4ff0525036fafa82e48315b7c88f6fb4feec4d 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -1047,7 +1047,7 @@ void DolphinMainWindow::setupActions()
     connect(split, &QAction::triggered, this, &DolphinMainWindow::toggleSplitView);
 
     QAction* stashSplit = actionCollection()->addAction(QStringLiteral("split_stash"));
     connect(split, &QAction::triggered, this, &DolphinMainWindow::toggleSplitView);
 
     QAction* stashSplit = actionCollection()->addAction(QStringLiteral("split_stash"));

-    actionCollection()->setDefaultShortcut(stashSplit, Qt::Key_F2);
+    actionCollection()->setDefaultShortcut(stashSplit, Qt::CTRL | Qt::Key_S);

     stashSplit->setText(i18nc("@action:intoolbar Stash", "Stash"));
     stashSplit->setToolTip(i18nc("@info", "Opens the stash virtual directory in a split window"));
     stashSplit->setIcon(QIcon::fromTheme(QStringLiteral("folder-visiting")));
     stashSplit->setText(i18nc("@action:intoolbar Stash", "Stash"));
     stashSplit->setToolTip(i18nc("@info", "Opens the stash virtual directory in a split window"));
     stashSplit->setIcon(QIcon::fromTheme(QStringLiteral("folder-visiting")));

diff --git a/src/dolphintabpage.cpp b/src/dolphintabpage.cpp
index e6440af5e22b0249f1ff61cdebcc40bcb826238c..3491dbad8b7cb132adac295fc902ee76ec05ed17 100644 (file)
--- a/src/dolphintabpage.cpp
+++ b/src/dolphintabpage.cpp
@@ -75,13 +75,9 @@ void DolphinTabPage::setSplitViewEnabled(bool enabled, bool stash /*= false*/)
 {
     if (m_splitViewEnabled != enabled) {
         m_splitViewEnabled = enabled;
 {
     if (m_splitViewEnabled != enabled) {
         m_splitViewEnabled = enabled;

-        QUrl url;
+

         if (enabled) {
         if (enabled) {

-            if (stash) {
-                url = QUrl("stash:/");
-            } else {
-                url = m_primaryViewContainer->url();
-            }
+            const QUrl& url = (stash) ? QUrl("stash:/") : m_primaryViewContainer->url();

             m_secondaryViewContainer = createViewContainer(url);
 
             const bool placesSelectorVisible = m_primaryViewContainer->urlNavigator()->isPlacesSelectorVisible();
             m_secondaryViewContainer = createViewContainer(url);
 
             const bool placesSelectorVisible = m_primaryViewContainer->urlNavigator()->isPlacesSelectorVisible();