Keep GlobalTrackCache locked until the entry has been deleted

1 files changed, 6 insertions, 2 deletions

diff --git a/src/track/globaltrackcache.cpp b/src/track/globaltrackcache.cpp
index f5450b22a6..0e7a2105b4 100644
--- a/src/track/globaltrackcache.cpp
+++ b/src/track/globaltrackcache.cpp
@@ -706,8 +706,12 @@ void GlobalTrackCache::slotEvictAndSave(
     DEBUG_ASSERT(!isCached(cacheEntryPtr->getPlainPtr()));
     saveEvictedTrack(cacheEntryPtr->getPlainPtr());
 
-    // here the cacheEntryPtr goes out of scope, the cache entry is
-    // deleted including the owned track
+    // Explicitly release the cacheEntryPtr including the owned
+    // track object while the cache is still locked.
+    cacheEntryPtr = {};
+
+    // Finally the exclusive lock on the cache is released implicitly
+    // when exiting the scope of this method.
 }
 
 bool GlobalTrackCache::tryEvict(Track* plainPtr) {