Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-01-18 00:56:49 +01:00
Code Releases Wiki Activity

fix: ImHex not closing when trying to exit with unsaved changes

Browse Source
This commit is contained in:
WerWolv 2023-11-24 11:42:27 +01:00
parent d34ad33c3c
commit d6d379108b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/builtin/source/content/events.cpp
View File

@ -38,6 +38,7 @@ namespace hex::plugin::builtin {
static bool imhexClosing = false; static bool imhexClosing = false;
EventManager::subscribe<EventWindowClosing>([](GLFWwindow *window) { EventManager::subscribe<EventWindowClosing>([](GLFWwindow *window) {
imhexClosing = false;
if (ImHexApi::Provider::isDirty() && !imhexClosing) { if (ImHexApi::Provider::isDirty() && !imhexClosing) {
glfwSetWindowShouldClose(window, GLFW_FALSE); glfwSetWindowShouldClose(window, GLFW_FALSE);
PopupQuestion::open("hex.builtin.popup.exit_application.desc"_lang, PopupQuestion::open("hex.builtin.popup.exit_application.desc"_lang,
@ -58,13 +59,16 @@ namespace hex::plugin::builtin {
} }
}); });
EventManager::subscribe<EventProviderClosing>([](const hex::prv::Provider *provider, bool *shouldClose) { EventManager::subscribe<EventProviderClosing>([](const prv::Provider *provider, bool *shouldClose) {
if (provider->isDirty()) { if (provider->isDirty()) {
*shouldClose = false; *shouldClose = false;
PopupUnsavedChanges::open("hex.builtin.popup.close_provider.desc"_lang, PopupUnsavedChanges::open("hex.builtin.popup.close_provider.desc"_lang,
[]{ []{
for (const auto &provider : ImHexApi::Provider::impl::getClosingProviders()) for (const auto &provider : ImHexApi::Provider::impl::getClosingProviders())
ImHexApi::Provider::remove(provider, true); ImHexApi::Provider::remove(provider, true);
if (imhexClosing)
ImHexApi::System::closeImHex(true);
}, },
[] { [] {
ImHexApi::Provider::impl::resetClosingProvider(); ImHexApi::Provider::impl::resetClosingProvider();