imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-03-30 21:05:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: Crash on exit

Browse Source
This commit is contained in:
WerWolv
2022-06-27 17:01:21 +02:00
parent e02ccd9b9b
commit 673027c82d
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libimhex/source/api/imhex_api.cpp
View File

@@ -231,7 +231,7 @@ namespace hex {
}
bool isValid() {
return !s_providers.empty();
return !s_providers.empty() && s_currentProvider < s_providers.size();
}
void add(prv::Provider *provider) {
@@ -246,7 +246,7 @@ namespace hex {
s_providers.erase(it);
if (it - s_providers.begin() == s_currentProvider)
if (it - s_providers.begin() == s_currentProvider && !s_providers.empty())
setCurrentProvider(0);
delete provider;

8
main/source/init/tasks.cpp
View File

@@ -170,6 +170,10 @@ namespace hex::init {
}
bool deleteSharedData() {
while (ImHexApi::Provider::isValid())
ImHexApi::Provider::remove(ImHexApi::Provider::get());
ContentRegistry::Provider::getEntries().clear();
ImHexApi::System::getInitArguments().clear();
ImHexApi::Tasks::getDeferredCalls().clear();
ImHexApi::HexEditor::impl::getBackgroundHighlights().clear();
@@ -227,10 +231,6 @@ namespace hex::init {
visualizers.clear();
}
while (ImHexApi::Provider::isValid())
ImHexApi::Provider::remove(ImHexApi::Provider::get());
ContentRegistry::Provider::getEntries().clear();
return true;
}

3
plugins/builtin/source/content/views/view_pattern_editor.cpp
View File

@@ -279,8 +279,9 @@ namespace hex::plugin::builtin {
EventManager::unsubscribe<EventProjectFileLoad>(this);
EventManager::unsubscribe<RequestSetPatternLanguageCode>(this);
EventManager::unsubscribe<EventFileLoaded>(this);
EventManager::unsubscribe<RequestChangeTheme>(this);
EventManager::unsubscribe<EventFileUnloaded>(this);
EventManager::unsubscribe<RequestChangeTheme>(this);
EventManager::unsubscribe<EventProviderChanged>(this);
}
void ViewPatternEditor::drawContent() {