games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-05 00:49:09 +02:00
Code Issues Releases Activity

Workaround for crash due to static destruction order

Browse Source
This commit is contained in:
Ivan Savenko
2025-03-26 20:32:55 +00:00
parent 7d3e59d7d3
commit 8771ecdf57
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/CConfigHandler.cpp
View File

@ -55,6 +55,13 @@ SettingsStorage::SettingsStorage():
{
}
SettingsStorage::~SettingsStorage()
{
// hack for possible crash due to static destruction order (setting storage can be destroyed before all listeners have died)
for(SettingsListener * listener : listeners)
listener->terminate();
}
void SettingsStorage::init(const std::string & dataFilename, const std::string & schema)
{
this->dataFilename = dataFilename;
@ -132,9 +139,15 @@ SettingsListener::SettingsListener(const SettingsListener &sl):
parent.listeners.insert(this);
}
void SettingsListener::terminate()
{
wasTerminated = true;
}
SettingsListener::~SettingsListener()
{
parent.listeners.erase(this);
if (!wasTerminated)
parent.listeners.erase(this);
}
void SettingsListener::nodeInvalidated(const std::vector<std::string> &changedPath)