Nav: Fixed race condition pressing Esc during popup opening frame causing crash.

ocornut · ocornut · commit 9f6aae3bf267 · 2022-09-29T19:48:27.000+02:00
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);

Original file line number	Diff line number	Diff line change
`@@ -10859,7 +10859,7 @@ static void ImGui::NavUpdateCancelRequest()`
`10859`	`10859`	`SetNavID(child_window->ChildId, ImGuiNavLayer_Main, 0, WindowRectAbsToRel(parent_window, child_rect));`
`10860`	`10860`	`NavRestoreHighlightAfterMove();`
`10861`	`10861`	`}`
`10862`		`- else if (g.OpenPopupStack.Size > 0 && !(g.OpenPopupStack.back().Window->Flags & ImGuiWindowFlags_Modal))`
	`10862`	`+ else if (g.OpenPopupStack.Size > 0 && g.OpenPopupStack.back().Window != NULL && !(g.OpenPopupStack.back().Window->Flags & ImGuiWindowFlags_Modal))`
`10863`	`10863`	`{`
`10864`	`10864`	`// Close open popup/menu`
`10865`	`10865`	`ClosePopupToLevel(g.OpenPopupStack.Size - 1, true);`