Skip to content

ImGui: guard ShowCursor against a torn-down context #333

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

Draft
Kheartz wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

ImGui: guard ShowCursor against a torn-down context #333

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
8 changes: 7 additions & 1 deletion code/framework/src/external/imgui/wrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,9 @@ namespace Framework::External::ImGUI {
if (!isContextInitialized) {
return;
}
// Cleared before teardown, not after: the backends and the context go away
// below, so anything gated on this flag must already see "not initialized".
isContextInitialized = false;

switch (_config.renderBackend) {
case Graphics::RendererBackend::BACKEND_D3D_9: {
Expand All @@ -152,7 +155,6 @@ namespace Framework::External::ImGUI {

ImGui::DestroyContext();

isContextInitialized = false;
Lifecycle::Shutdown();
}

Expand Down Expand Up @@ -255,6 +257,10 @@ namespace Framework::External::ImGUI {
}

void Wrapper::ShowCursor(bool show) {
// Reachable from teardown paths after Shutdown() or a failed Init().
if (!isContextInitialized) {
return;
}
ImGuiIO &io = ImGui::GetIO();
io.MouseDrawCursor = show;
}
Expand Down
Loading