1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-17 20:13:07 +01:00

Fix premature deletion of dependencies (#5952)

In particular, the object repository can potentially be deleted before the object manager is deleted. This causes a crash when the object manager is deleted because it requires the object repository within the destructor.
This commit is contained in:
Ted John
2017-07-20 17:44:31 +01:00
committed by GitHub
parent 260f342d73
commit 2eb9657781
5 changed files with 29 additions and 16 deletions

View File

@@ -607,17 +607,17 @@ private:
}
};
static std::unique_ptr<ObjectManager> _objectManager;
static ObjectManager * _objectManager = nullptr;
IObjectManager * CreateObjectManager(IObjectRepository * objectRepository)
{
_objectManager = std::unique_ptr<ObjectManager>(new ObjectManager(objectRepository));
return _objectManager.get();
_objectManager = new ObjectManager(objectRepository);
return _objectManager;
}
IObjectManager * GetObjectManager()
{
return _objectManager.get();
return _objectManager;
}
extern "C"