Fix adding duplicate show/hide tray menu items

Signed-off-by: Lukas Holecek <hluk@email.cz>
hluk · Sep 24, 2019 · a368e1c · a368e1c
1 parent 823ab67
commit a368e1c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
@@ -3091,9 +3091,14 @@ void MainWindow::updateTrayMenuItemsTimeout()
     interruptMenuCommandFilters(&m_trayMenuMatchCommands);
     m_trayMenu->clearClipboardItems();
 
-    QAction *act = m_trayMenu->addAction( appIcon(), tr("&Show/Hide") );
-    connect(act, &QAction::triggered, this, &MainWindow::toggleVisible);
-    m_trayMenu->setDefaultAction(act);
+    if (m_showHideAction) {
+        m_trayMenu->addAction(m_showHideAction);
+    } else {
+        m_showHideAction = m_trayMenu->addAction( appIcon(), tr("&Show/Hide") );
+        connect(m_showHideAction.data(), &QAction::triggered, this, &MainWindow::toggleVisible);
+    }
+
+    m_trayMenu->setDefaultAction(m_showHideAction);
     addTrayAction(Actions::File_Preferences);
     addTrayAction(Actions::File_ToggleClipboardStoring);
     m_trayMenu->addSeparator();

diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
@@ -689,6 +689,7 @@ class MainWindow final : public QMainWindow
     bool m_activatingItem = false;
 
     QVector< QPointer<QAction> > m_actions;
+    QPointer<QAction> m_showHideAction;
     MenuItems m_menuItems;
 
     QList<PersistentDisplayItem> m_displayItemList;