Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 20:36:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4117 from Atlante45/dm_update

Browse source 
Drop DM ref before creating new object
This commit is contained in:
Stephen Birarda 2015-01-15 14:15:01 -08:00
commit b2c5847d9b
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/shared/src/DependencyManager.h
View file

@ -83,11 +83,13 @@ template <typename T, typename ...Args>
QSharedPointer<T> DependencyManager::set(Args&&... args) { QSharedPointer<T> DependencyManager::set(Args&&... args) {
static size_t hashCode = _manager.getHashCode<T>(); static size_t hashCode = _manager.getHashCode<T>();
QSharedPointer<T> instance(new T(args...), &T::customDeleter); QSharedPointer<Dependency>& instance = _manager.safeGet(hashCode);
QSharedPointer<Dependency> storedInstance = qSharedPointerCast<Dependency>(instance); instance.clear(); // Clear instance before creation of new one to avoid edge cases
_manager.safeGet(hashCode).swap(storedInstance); QSharedPointer<T> newInstance(new T(args...), &T::customDeleter);
QSharedPointer<Dependency> storedInstance = qSharedPointerCast<Dependency>(newInstance);
instance.swap(storedInstance);
return instance; return newInstance;
} }
template <typename T> template <typename T>