FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a hasInstance to ResourceManager

Browse Source 
This is needed to allow order-independent shutdown, due to the dumb
ownership behaviour for providers.
This commit is contained in:
Automatic Release Builder 2020-10-06 11:34:03 +01:00 committed by James Turner
parent fba00d6894
commit b7308fa3ad
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
simgear/misc/ResourceManager.cxx
View File

@ -49,6 +49,11 @@ ResourceManager* ResourceManager::instance()
return static_manager; return static_manager;
} }
bool ResourceManager::haveInstance()
{
return static_manager != nullptr;
}
ResourceManager::~ResourceManager() ResourceManager::~ResourceManager()
{ {
assert(this == static_manager); assert(this == static_manager);

2
simgear/misc/ResourceManager.hxx
View File

@ -47,6 +47,8 @@ public:
static ResourceManager* instance(); static ResourceManager* instance();
static bool haveInstance();
static void reset(); static void reset();
/** /**