diff options
| author | Szabolcs David <davidsz@inf.u-szeged.hu> | 2015-12-07 06:39:13 -0800 |
|---|---|---|
| committer | Szabolcs David <davidsz@inf.u-szeged.hu> | 2016-01-05 13:08:40 +0000 |
| commit | 2656cdbeb0a45357cfb2621b0307a4e1462fbaaf (patch) | |
| tree | 783ff611f7d39dbd990713b6a394bbef654924cd /src/core/cookie_monster_delegate_qt.cpp | |
| parent | 3f92ac7456a6c89fee71623594058c928a727204 (diff) | |
Fix an assertion in QWebEngineCookieStore
Don't process pending cookies after resetting the CookieMonster
to 0 in the CookieMonsterDelegateQt. We are destroying the old
cookie store, so we can reject the pending cookies here.
Task-number: QTBUG-50160
Change-Id: I0b2ca7ee0f5e3fdcf99680bb9c0a2772a10ff3f4
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'src/core/cookie_monster_delegate_qt.cpp')
| -rw-r--r-- | src/core/cookie_monster_delegate_qt.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/core/cookie_monster_delegate_qt.cpp b/src/core/cookie_monster_delegate_qt.cpp index fa4e9e8bf..e740d01e7 100644 --- a/src/core/cookie_monster_delegate_qt.cpp +++ b/src/core/cookie_monster_delegate_qt.cpp @@ -139,10 +139,18 @@ void CookieMonsterDelegateQt::deleteAllCookies(quint64 callbackId) void CookieMonsterDelegateQt::setCookieMonster(net::CookieMonster* monster) { + if (!monster && !m_cookieMonster) + return; + m_cookieMonster = monster; - if (m_client) + if (!m_client) + return; + + if (monster) m_client->d_func()->processPendingUserCookies(); + else + m_client->d_func()->rejectPendingUserCookies(); } void CookieMonsterDelegateQt::setClient(QWebEngineCookieStore *client) |