Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2024-12-01 02:37:18 +01:00
Code Releases Wiki Activity

fix: GLFW error on exit

Browse Source
This commit is contained in:
WerWolv 2022-08-03 10:45:50 +02:00
parent 0ac8fcd1eb
commit ace25d353b
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/libimhex/include/hex/api/event.hpp
View File

@ -95,6 +95,11 @@ namespace hex {
} }
} }
static void clear() noexcept {
s_events.clear();
s_tokenStore.clear();
}
private: private:
static std::map<void *, EventList::iterator> s_tokenStore; static std::map<void *, EventList::iterator> s_tokenStore;
static EventList s_events; static EventList s_events;

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

@ -163,6 +163,8 @@ namespace hex::init {
} }
bool deleteSharedData() { bool deleteSharedData() {
EventManager::clear();
while (ImHexApi::Provider::isValid()) while (ImHexApi::Provider::isValid())
ImHexApi::Provider::remove(ImHexApi::Provider::get()); ImHexApi::Provider::remove(ImHexApi::Provider::get());
ContentRegistry::Provider::getEntries().clear(); ContentRegistry::Provider::getEntries().clear();

6
main/source/window/window.cpp
View File

@ -160,14 +160,14 @@ namespace hex {
} }
Window::~Window() { Window::~Window() {
this->exitImGui();
this->exitGLFW();
EventManager::unsubscribe<EventProviderDeleted>(this); EventManager::unsubscribe<EventProviderDeleted>(this);
EventManager::unsubscribe<RequestCloseImHex>(this); EventManager::unsubscribe<RequestCloseImHex>(this);
EventManager::unsubscribe<RequestChangeWindowTitle>(this); EventManager::unsubscribe<RequestChangeWindowTitle>(this);
EventManager::unsubscribe<EventAbnormalTermination>(this); EventManager::unsubscribe<EventAbnormalTermination>(this);
EventManager::unsubscribe<RequestOpenPopup>(this); EventManager::unsubscribe<RequestOpenPopup>(this);
this->exitImGui();
this->exitGLFW();
} }
void Window::loop() { void Window::loop() {