Fix copying without pasting from tray menu

Fixes #686
hluk · Apr 12, 2017 · d1d5e89 · d1d5e89
1 parent 7a77c25
commit d1d5e89
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
@@ -1775,12 +1775,12 @@ void MainWindow::addMenuItems(TrayMenu *menu, ClipboardBrowser *c, int maxItemCo
 
 void MainWindow::onMenuActionTriggered(ClipboardBrowser *c, uint itemHash, bool omitPaste)
 {
-    if (!c || !m_options.trayItemPaste)
+    if ( !c || !c->moveToClipboard(itemHash) )
         return;
 
     PlatformWindowPtr lastWindow = m_lastWindow;
 
-    if ( c->moveToClipboard(itemHash) && lastWindow && !omitPaste && canPaste() )
+    if ( m_options.trayItemPaste && lastWindow && !omitPaste && canPaste() )
         pasteClipboard(lastWindow);
 }
 

diff --git a/src/tests/tests.cpp b/src/tests/tests.cpp
@@ -1987,6 +1987,36 @@ void Tests::traySearch()
     WAIT_FOR_CLIPBOARD("B");
 }
 
+void Tests::trayPaste()
+{
+    RUN("config" << "tray_tab_is_current" << "false", "false\n");
+
+    const auto tab1 = testTab(1);
+    RUN("setCurrentTab" << tab1, "");
+    RUN("keys" << "CTRL+N" << ":NEW ", "");
+
+    RUN("add" << "TEST", "");
+    RUN("menu", "");
+    waitFor(waitMsShow);
+    RUN("keys" << "ENTER", "");
+    WAIT_FOR_CLIPBOARD("TEST");
+
+    RUN("keys" << "F2", "");
+    RUN("tab" << tab1 << "read" << "0", "NEW TEST");
+
+    RUN("keys" << "CTRL+N" << ":NEW ", "");
+
+    RUN("config" << "tray_item_paste" << "false", "false\n");
+    RUN("add" << "TEST2", "");
+    RUN("menu", "");
+    waitFor(waitMsShow);
+    RUN("keys" << "ENTER", "");
+    WAIT_FOR_CLIPBOARD("TEST2");
+
+    RUN("keys" << "F2", "");
+    RUN("tab" << tab1 << "read" << "0", "NEW ");
+}
+
 void Tests::configTrayTab()
 {
     const auto tab1 = testTab(1);

diff --git a/src/tests/tests.h b/src/tests/tests.h
@@ -166,6 +166,7 @@ private slots:
     void menu();
 
     void traySearch();
+    void trayPaste();
 
     // Options for tray menu.
     void configTrayTab();