From 3d5234eb9a200752bce8fb2539efeb4d812b3b27 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Thu, 20 Mar 2014 14:02:19 +0100 Subject: [PATCH] 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 --- .../platforms/android/qandroidassetsfileenginehandler.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp b/src/plugins/platforms/android/qandroidassetsfileenginehandler.cpp index 4968b8f188a..224a8ca9f7d 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