Docking: Fix appending to windows causing a child window to be insert…

…ed to g.WindowsFocusOrder which eventually causes a crash. (ocornut#5515)
rokups · Aug 2, 2022 · 35c4944 · 35c4944
1 parent 7ff00cc
commit 35c4944
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
@@ -69,6 +69,7 @@ Other Changes:
 - Backends: Metal: Add dispatch synchronization. (#5447) [@luigifcruz]
 - Backends: OSX: Fixes to support full app creation in C++. (#5403) [@stack]
 - TabBar: Fixed a crash when closing multiple docked windows with appended tab button. [@rokups]
+- Window: Fixed a potential crash when appending to a child window. [@rokups] (#5515)
 
 
 -----------------------------------------------------------------------

diff --git a/imgui.cpp b/imgui.cpp
@@ -6087,7 +6087,10 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
     const bool window_just_created = (window == NULL);
     if (window_just_created)
         window = CreateNewWindow(name, flags);
-    else
+
+    const int current_frame = g.FrameCount;
+    const bool first_begin_of_the_frame = (window->LastFrameActive != current_frame);
+    if (first_begin_of_the_frame)
         UpdateWindowInFocusOrderList(window, window_just_created, flags);
 
     // Automatically disable manual moving/resizing when NoInputs is set
@@ -6097,8 +6100,6 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
     if (flags & ImGuiWindowFlags_NavFlattened)
         IM_ASSERT(flags & ImGuiWindowFlags_ChildWindow);
 
-    const int current_frame = g.FrameCount;
-    const bool first_begin_of_the_frame = (window->LastFrameActive != current_frame);
     window->IsFallbackWindow = (g.CurrentWindowStack.Size == 0 && g.WithinFrameScopeWithImplicitWindow);
 
     // Update the Appearing flag