From 4abe00ff6cac1376981282b59498bd4f651e3452 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Sat, 14 Jun 2014 00:50:33 +0000 Subject: [PATCH] Shib: Ensure browser view gets closed before QNAM Otherwise, QWebPage tries to delete its QNetworkReplies, which have already been deleted by the QNAM destruction, who is their parent. Fixes #1840 --- src/creds/shibbolethcredentials.cpp | 2 +- src/wizard/owncloudshibbolethcredspage.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/creds/shibbolethcredentials.cpp b/src/creds/shibbolethcredentials.cpp index 55aabc093..6c01efc53 100644 --- a/src/creds/shibbolethcredentials.cpp +++ b/src/creds/shibbolethcredentials.cpp @@ -352,7 +352,7 @@ void ShibbolethCredentials::showLoginWindow(Account* account) } _browser = new ShibbolethWebView(account); connect(_browser, SIGNAL(shibbolethCookieReceived(QNetworkCookie, Account*)), - this, SLOT(onShibbolethCookieReceived(QNetworkCookie, Account*))); + this, SLOT(onShibbolethCookieReceived(QNetworkCookie, Account*)), Qt::QueuedConnection); connect(_browser, SIGNAL(rejected()), this, SLOT(slotBrowserRejected())); _browser->show(); diff --git a/src/wizard/owncloudshibbolethcredspage.cpp b/src/wizard/owncloudshibbolethcredspage.cpp index 076d74188..40053d69b 100644 --- a/src/wizard/owncloudshibbolethcredspage.cpp +++ b/src/wizard/owncloudshibbolethcredspage.cpp @@ -48,7 +48,7 @@ void OwncloudShibbolethCredsPage::setupBrowser() _browser = new ShibbolethWebView(account); connect(_browser, SIGNAL(shibbolethCookieReceived(const QNetworkCookie&, Account*)), - this, SLOT(slotShibbolethCookieReceived())); + this, SLOT(slotShibbolethCookieReceived()), Qt::QueuedConnection); connect(_browser, SIGNAL(rejected()), this, SLOT(slotBrowserRejected()));