X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fresourcemanager.cpp;h=9835adde3e8dd7efffe038f6eeb7f39a7c26101c;hp=57b0327336b06a8012b0319d35df4a895498168b;hb=975162f86071985913b59a835d38046e1c271594;hpb=6cbf65a87765e0aeac759a685cc6a1b7c836e7f8 diff --git a/source/resourcemanager.cpp b/source/resourcemanager.cpp index 57b03273..9835adde 100644 --- a/source/resourcemanager.cpp +++ b/source/resourcemanager.cpp @@ -163,6 +163,9 @@ void ResourceManager::remove_resource(Resource &r) else if(state>ManagedResource::LOAD_QUEUED && state::const_iterator i=managed.watchers.begin(); i!=managed.watchers.end(); ++i) + (*i)->resource_removed(r); + MutexLock lock(map_mutex); remove_existing(resources, &r); } @@ -411,13 +414,13 @@ void ResourceManager::LoadingThread::main() } } -ResourceManager::ManagedResource *ResourceManager::LoadingThread::front(LoadQueue &queue) +ResourceManager::ManagedResource *ResourceManager::LoadingThread::front(LoadQueue &que) { MutexLock lock(queue_mutex); - if(queue.empty()) + if(que.empty()) return 0; - return queue.front(); + return que.front(); } void ResourceManager::LoadingThread::add_resource(ManagedResource &r)