diff options
| author | Christian Strømme <christian.stromme@digia.com> | 2014-08-05 19:43:23 +0200 |
|---|---|---|
| committer | Christian Stromme <christian.stromme@digia.com> | 2014-08-06 17:16:36 +0200 |
| commit | 1671dacb521e92986ff2d274d009e3e60a026045 (patch) | |
| tree | 01c15c10e9f0ca61df300cd3f5f5471c227a4c65 /src/plugins/platforms/android/androidjnimain.cpp | |
| parent | 4946ed049608251cf750a6250b4c94cda1c2e707 (diff) | |
Android: Remove native views when their window is destroyd.
destroySurface() was not removing the native view as they are not
in the m_surfaces map.
Task-number: QTBUG-40159
Change-Id: Ib5457e0bd34141654fa47883f5e125d894b0bd05
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'src/plugins/platforms/android/androidjnimain.cpp')
| -rw-r--r-- | src/plugins/platforms/android/androidjnimain.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/platforms/android/androidjnimain.cpp b/src/plugins/platforms/android/androidjnimain.cpp index 3e3e169df9..e7e0375adf 100644 --- a/src/plugins/platforms/android/androidjnimain.cpp +++ b/src/plugins/platforms/android/androidjnimain.cpp @@ -413,10 +413,9 @@ namespace QtAndroid { QMutexLocker lock(&m_surfacesMutex); const auto &it = m_surfaces.find(surfaceId); - if (it == m_surfaces.end()) - return; + if (it != m_surfaces.end()) + m_surfaces.remove(surfaceId); - m_surfaces.remove(surfaceId); QJNIEnvironmentPrivate env; if (!env) return; |