From: arnav dhamija <arnav.dhamija@gmail.com>
Date: Tue, 27 Sep 2016 05:07:08 +0000 (+0530)
Subject: Changed shortcut, but need to fix async conditions
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/a097a1277a02a5dd0f6d687e8bc2c3a7ec399efd

Changed shortcut, but need to fix async conditions
---

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 30498952c..ea4ff0525 100644
--- 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"));
-    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")));
diff --git a/src/dolphintabpage.cpp b/src/dolphintabpage.cpp
index e6440af5e..3491dbad8 100644
--- 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;
-        QUrl url;
+
         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();