Skip to content

Fixes issue with g_ContextMap outliving zgui #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
simeks wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixes issue with g_ContextMap outliving zgui #88

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions libs/imgui/backends/imgui_impl_glfw.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,6 +808,13 @@ void ImGui_ImplGlfw_Shutdown()
io.BackendFlags &= ~(ImGuiBackendFlags_HasMouseCursors | ImGuiBackendFlags_HasSetMousePos | ImGuiBackendFlags_HasGamepad | ImGuiBackendFlags_PlatformHasViewports | ImGuiBackendFlags_HasMouseHoveredViewport);
ImGui_ImplGlfw_ContextMap_Remove(bd->Window);
IM_DELETE(bd);

if (g_ContextMap.empty()) {
// zgui overrides the default allocator of imgui and memory allocated by g_ContextMap will belong to zgui.
// By freeing this memory now we avoid issues with the destructor freeing after zgui has been deinitialized.
g_ContextMap.clear();
}

}

static void ImGui_ImplGlfw_UpdateMouseData()
Expand Down
Loading