X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources%2Fresourcemanager.cpp;h=91b374244090f78397b9cbfe78db63c36c97026b;hb=HEAD;hp=02a93d949997c3aae421b3f4322e3bfb0881a855;hpb=28d12c73b197a16f7635badc01e42375728fde85;p=libs%2Fgl.git

diff --git a/source/resources/resourcemanager.cpp b/source/resources/resourcemanager.cpp
index 02a93d94..91b37424 100644
--- a/source/resources/resourcemanager.cpp
+++ b/source/resources/resourcemanager.cpp
@@ -63,6 +63,16 @@ void ResourceManager::add_resource(Resource &r)
 	insert_unique(resources, &r, ManagedResource(r));
 }
 
+void ResourceManager::move_resource(Resource &from, Resource &to)
+{
+	if(to.get_manager()!=this || from.get_manager_data()!=to.get_manager_data())
+		throw invalid_operation("ResourceManager::move_resource");
+	ManagedResource *managed = reinterpret_cast<ManagedResource *>(to.get_manager_data());
+	MutexLock lock(map_mutex);
+	insert_unique(resources, &to, *managed);
+	resources.erase(&from);
+}
+
 const ResourceManager::ManagedResource &ResourceManager::get_managed_resource(const Resource &r) const
 {
 	MutexLock lock(map_mutex);
@@ -393,7 +403,7 @@ void ResourceManager::LoadingThread::main()
 			catch(const exception &e)
 			{
 				MutexLock lock(queue_mutex);
-				error_queue.push_back(resource_load_error(managed->location.name, e));
+				error_queue.emplace_back(managed->location.name, e);
 				managed->state = ManagedResource::LOAD_ERROR;
 			}