mirror of
https://github.com/WerWolv/ImHex.git
synced 2026-04-02 21:47:40 -05:00
fix: ImHex should crash less often now when exiting
This commit is contained in:
@@ -10,14 +10,19 @@ namespace hex {
|
||||
/* Settings */
|
||||
|
||||
void ContentRegistry::Settings::load() {
|
||||
bool loaded = false;
|
||||
for (const auto &dir : hex::getPath(ImHexPath::Config)) {
|
||||
std::ifstream settingsFile(dir + "/settings.json");
|
||||
|
||||
if (settingsFile.good()) {
|
||||
settingsFile >> getSettingsData();
|
||||
loaded = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!loaded)
|
||||
ContentRegistry::Settings::store();
|
||||
}
|
||||
|
||||
void ContentRegistry::Settings::store() {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
namespace hex {
|
||||
|
||||
std::map<void*, EventManager::EventList::iterator> EventManager::s_tokenStore;
|
||||
EventManager::EventList EventManager::s_events;
|
||||
std::map<void*, EventManager::EventList::iterator> EventManager::s_tokenStore;
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user