Make sure login required dialog is shown once at most

owncloud · Oct 26, 2022 · 6b9f3da · 6b9f3da
1 parent 8ce22a6
commit 6b9f3da
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/gui/creds/httpcredentialsgui.cpp b/src/gui/creds/httpcredentialsgui.cpp
@@ -104,6 +104,10 @@ void HttpCredentialsGui::asyncAuthResult(OAuth::Result r, const QString &user,
 
 void HttpCredentialsGui::showDialog()
 {
+    if (_loginRequiredDialog != nullptr) {
+        return;
+    }
+
     auto *dialog = new LoginRequiredDialog(LoginRequiredDialog::Mode::Basic, ocApp()->gui()->settingsDialog());
 
     // make sure it's cleaned up since it's not owned by the account settings (also prevents memory leaks)
@@ -136,6 +140,8 @@ void HttpCredentialsGui::showDialog()
     QTimer::singleShot(0, [contentWidget]() {
         contentWidget->setFocus(Qt::OtherFocusReason);
     });
+
+    _loginRequiredDialog = dialog;
 }
 
 QUrl HttpCredentialsGui::authorisationLink() const

diff --git a/src/gui/creds/httpcredentialsgui.h b/src/gui/creds/httpcredentialsgui.h
@@ -69,6 +69,7 @@ private slots:
 
 private:
     QScopedPointer<AccountBasedOAuth, QScopedPointerObjectDeleteLater<AccountBasedOAuth>> _asyncAuth;
+    QPointer<QWidget> _loginRequiredDialog;
 };
 
 } // namespace OCC