Nav: Fixed race condition pressing Esc during popup opening frame cau…

…sing crash.
fangshun2004 · Sep 29, 2022 · 9f6aae3 · 9f6aae3
1 parent bd2355a
commit 9f6aae3
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/imgui.cpp b/imgui.cpp
@@ -10859,7 +10859,7 @@ static void ImGui::NavUpdateCancelRequest()
         SetNavID(child_window->ChildId, ImGuiNavLayer_Main, 0, WindowRectAbsToRel(parent_window, child_rect));
         NavRestoreHighlightAfterMove();
     }
-    else if (g.OpenPopupStack.Size > 0 && !(g.OpenPopupStack.back().Window->Flags & ImGuiWindowFlags_Modal))
+    else if (g.OpenPopupStack.Size > 0 && g.OpenPopupStack.back().Window != NULL && !(g.OpenPopupStack.back().Window->Flags & ImGuiWindowFlags_Modal))
     {
         // Close open popup/menu
         ClosePopupToLevel(g.OpenPopupStack.Size - 1, true);