Fix closed account wizard being brought up when clicking tray icon

src/gui/owncloudsetupwizard.cpp

@@ -1,4 +1,4 @@
 /*
  * Copyright (C) by Klaas Freitag <[email protected]>
  * Copyright (C) by Krzesimir Nowak <[email protected]>
  *
@@ -13,7 +13,7 @@
  * for more details.
  */
 
 #include <QAbstractButton>
 #include <QtCore>
 #include <QProcess>
 #include <QMessageBox>
@@ -85,6 +85,7 @@
 
     wiz = new OwncloudSetupWizard(parent);
     connect(wiz, SIGNAL(ownCloudWizardDone(int)), obj, amember);
+    connect(wiz->_ocWizard, &OwncloudWizard::wizardClosed, obj, [] { wiz.clear(); });
     FolderMan::instance()->setSyncEnabled(false);
     wiz->startWizard();
 }

src/gui/wizard/owncloudwizard.cpp

@@ -13,7 +13,7 @@
  * for more details.
  */
 
 #include "account.h"
 #include "config.h"
 #include "configfile.h"
 #include "theme.h"
@@ -408,6 +408,21 @@
     QWizard::changeEvent(e);
 }
 
+void OwncloudWizard::hideEvent(QHideEvent *event)
+{
+    QWizard::hideEvent(event);
+#ifdef Q_OS_MACOS
+    // Closing the window on macOS hides it rather than closes it, so emit a wizardClosed here
+    emit wizardClosed();
+#endif
+}
+
+void OwncloudWizard::closeEvent(QCloseEvent *event)
+{
+    emit wizardClosed();
+    QWizard::closeEvent(event);
+}
+
 void OwncloudWizard::customizeStyle()
 {
     // HINT: Customize wizard's own style here, if necessary in the future (Dark-/Light-Mode switching)

src/gui/wizard/owncloudwizard.h

@@ -16,7 +16,7 @@
 #ifndef MIRALL_OWNCLOUD_WIZARD_H
 #define MIRALL_OWNCLOUD_WIZARD_H
 
 #include <QWizard>
 #include <QLoggingCategory>
 #include <QSslKey>
 #include <QSslCertificate>
@@ -110,9 +110,12 @@
     void needCertificate();
     void styleChanged();
     void onActivate();
+    void wizardClosed();
 
 protected:
     void changeEvent(QEvent *) override;
+    void hideEvent(QHideEvent *) override;
+    void closeEvent(QCloseEvent *) override;
 
 private:
     void customizeStyle();