diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2014-03-20 14:02:19 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-21 06:31:27 +0100 |
| commit | 3d5234eb9a200752bce8fb2539efeb4d812b3b27 (patch) | |
| tree | 0f135902e6e03eabf6f0f2e452112a8089b37b91 | |
| parent | b76612979cd4afb67a2c09d5668fbc53f3fcc64b (diff) | |
REG: Android: Fix freeze when accessing assets
Change 287fa94fe2f93e2857a4c15f69435c4ea14de82e created a freeze
in the assets file engine because it will try locking the mutex
twice. Since prepopulateCache() is only called from create(),
we don't need to lock it recursively.
Task-number: QTBUG-37661
Change-Id: I00d0fed132a86c1be5603484eb6ee05454da9ef0
Reviewed-by: BogDan Vatra <bogdan@kde.org>
| -rw-r--r-- | src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp b/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp index 4968b8f188..224a8ca9f7 100644 --- a/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp +++ b/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp @@ -276,7 +276,6 @@ void AndroidAssetsFileEngineHandler::prepopulateCache() const Q_ASSERT(!m_hasTriedPrepopulatingCache); m_hasTriedPrepopulatingCache = true; - QMutexLocker locker(&m_assetsCacheMutext); Q_ASSERT(m_assetsCache.isEmpty()); // Failsafe: Don't read cache files that are larger than 1MB |