mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-25 05:45:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Shib: Ensure browser view gets closed before QNAM

Browse source 
Otherwise, QWebPage tries to delete its QNetworkReplies, which have
already been deleted by the QNAM destruction, who is their parent.

Fixes #1840
This commit is contained in:
Daniel Molkentin 2014-06-14 00:50:33 +00:00
parent e1db834ec9
commit 4abe00ff6c
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/creds/shibbolethcredentials.cpp
View file

@ -352,7 +352,7 @@ void ShibbolethCredentials::showLoginWindow(Account* account)
} }
_browser = new ShibbolethWebView(account); _browser = new ShibbolethWebView(account);
connect(_browser, SIGNAL(shibbolethCookieReceived(QNetworkCookie, 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())); connect(_browser, SIGNAL(rejected()), this, SLOT(slotBrowserRejected()));
_browser->show(); _browser->show();

2
src/wizard/owncloudshibbolethcredspage.cpp
View file

@ -48,7 +48,7 @@ void OwncloudShibbolethCredsPage::setupBrowser()
_browser = new ShibbolethWebView(account); _browser = new ShibbolethWebView(account);
connect(_browser, SIGNAL(shibbolethCookieReceived(const QNetworkCookie&, Account*)), connect(_browser, SIGNAL(shibbolethCookieReceived(const QNetworkCookie&, Account*)),
this, SLOT(slotShibbolethCookieReceived())); this, SLOT(slotShibbolethCookieReceived()), Qt::QueuedConnection);
connect(_browser, SIGNAL(rejected()), connect(_browser, SIGNAL(rejected()),
this, SLOT(slotBrowserRejected())); this, SLOT(slotBrowserRejected()));