From: Claudio Cambra <claudio.cambra@gmail.com>
Date: Mon, 20 Jun 2022 17:13:11 +0000 (+0200)
Subject: Fix the system tray menu not being correctly replaced in setupContextMenu
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~16^2~40^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cf8c5c878f708d7a1772ef973ac54b5b161ff8ee;p=nextcloud-desktop.git

Fix the system tray menu not being correctly replaced in setupContextMenu

Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
---

diff --git a/src/gui/systray.cpp b/src/gui/systray.cpp
index 2b223e9c7..0e9cd08ee 100644
--- a/src/gui/systray.cpp
+++ b/src/gui/systray.cpp
@@ -162,6 +162,9 @@ void Systray::setupContextMenu()
     }
 
     _contextMenu = new QMenu();
+    // NOTE: for reasons unclear, setting the the new menu after adding all the actions
+    // will not work on GNOME, as the old menu will not be correctly replaced.
+    setContextMenu(_contextMenu);
 
     if (AccountManager::instance()->accounts().isEmpty()) {
         _contextMenu->addAction(tr("Add account"), this, &Systray::openAccountWizard);
@@ -174,7 +177,6 @@ void Systray::setupContextMenu()
     _contextMenu->addAction(tr("Settings"), this, &Systray::openSettings);
     _contextMenu->addAction(tr("Help"), this, &Systray::openHelp);
     _contextMenu->addAction(tr("Exit %1").arg(Theme::instance()->appNameGUI()), this, &Systray::shutdown);
-    setContextMenu(_contextMenu);
 
     connect(_contextMenu, &QMenu::aboutToShow, [=] {
         const auto folders = FolderMan::instance()->map();