Merge pull request #10193 from nextcloud/i2h3/competent-goldstine-bf0022

fix(#10177): Unblock menu bar extra

Author: i2h3

src/gui/owncloudgui.cpp

@@ -233,10 +233,13 @@ void ownCloudGui::slotTrayClicked(QSystemTrayIcon::ActivationReason reason)
     if (reason == QSystemTrayIcon::DoubleClick && currentUser && currentUser->hasLocalFolder()) {
         currentUser->openLocalFolder();
     } else if (reason == QSystemTrayIcon::Trigger) {
-        if (OwncloudSetupWizard::bringWizardToFrontIfVisible()) {
-            // brought wizard to front
-        } else if (AccountManager::instance()->accounts().isEmpty()) {
-            slotNewAccountWizard();
+        if (AccountManager::instance()->accounts().isEmpty()) {
+            // Without a configured account the tray icon drives the setup wizard
+            // directly: open it, or bring the existing one back to front instead
+            // of opening a second wizard.
+            if (!OwncloudSetupWizard::bringWizardToFrontIfVisible()) {
+                slotNewAccountWizard();
+            }
         } else if (_tray->raiseDialogs()) {
             // Brings dialogs hidden by other apps to front, returns true if any raised
         } else if (_tray->isOpen()) {