Merge pull request #7488 from nextcloud/bugfix/close-wizard-properly

nextcloud · Nov 15, 2024 · 73947c7 · 73947c7
2 parents 3078664 + fe7c121
commit 73947c7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/src/gui/owncloudsetupwizard.cpp b/src/gui/owncloudsetupwizard.cpp
@@ -85,6 +85,7 @@ void OwncloudSetupWizard::runWizard(QObject *obj, const char *amember, QWidget *
 
     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();
 }

diff --git a/src/gui/wizard/owncloudwizard.cpp b/src/gui/wizard/owncloudwizard.cpp
@@ -408,6 +408,21 @@ void OwncloudWizard::changeEvent(QEvent *e)
     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)

diff --git a/src/gui/wizard/owncloudwizard.h b/src/gui/wizard/owncloudwizard.h
@@ -110,9 +110,12 @@ public slots:
     void needCertificate();
     void styleChanged();
     void onActivate();
+    void wizardClosed();
 
 protected:
     void changeEvent(QEvent *) override;
+    void hideEvent(QHideEvent *) override;
+    void closeEvent(QCloseEvent *) override;
 
 private:
     void customizeStyle();