diff options
| author | Pierre Rossi <pierre.rossi@theqtcompany.com> | 2015-03-22 19:23:42 +0100 |
|---|---|---|
| committer | Pierre Rossi <pierre.rossi@theqtcompany.com> | 2015-03-22 19:26:27 +0100 |
| commit | dac590ce0d0b40af8332209c402639a5e14e4b6b (patch) | |
| tree | 48d49e6693d35e3a801f381b451620645ebb5f6c /src/core/web_contents_delegate_qt.cpp | |
| parent | d51d9b81da1c6c0989b2d5d68d09ede70144abd5 (diff) | |
| parent | 6e8fdb129b7ffa19eacb3ef5d03989e52a6a0169 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: Icc27b58763c9aeac9f940fa17d3381fe1f4659ac
Diffstat (limited to 'src/core/web_contents_delegate_qt.cpp')
| -rw-r--r-- | src/core/web_contents_delegate_qt.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp index 5890a4c36..4050dc789 100644 --- a/src/core/web_contents_delegate_qt.cpp +++ b/src/core/web_contents_delegate_qt.cpp @@ -357,9 +357,10 @@ void WebContentsDelegateQt::cancelGeolocationPermissionRequest(const GURL &reque void WebContentsDelegateQt::geolocationPermissionReply(const QUrl &origin, bool permission) { - if (m_geolocationPermissionRequests.contains(origin)) { - m_geolocationPermissionRequests[origin].Run(permission); - m_geolocationPermissionRequests.remove(origin); + auto it = m_geolocationPermissionRequests.find(origin); + if (it != m_geolocationPermissionRequests.end()) { + (*it).Run(permission); + m_geolocationPermissionRequests.erase(it); } } |