Merge with 6e384f1d399717d5c68fca35de1f00394a6f1d58

This commit is contained in:
Hombrenatureh.510
2014-03-05 21:04:53 +01:00
parent 9ab0d2b2f3
commit 518a318822
36 changed files with 1168 additions and 529 deletions

View File

@@ -226,7 +226,7 @@ void CacheManager::closeThumbnail (Thumbnail* t) {
MyMutex::MyLock lock(mutex_);
t->updateCache ();
// t->updateCache ();
string_thumb_map::iterator r = openEntries.find (t->getFileName());
if (r!=openEntries.end())
openEntries.erase (r);