From cab82d9c76a7bafdf1b87a8204dbc32bdd29758d Mon Sep 17 00:00:00 2001 From: ocornut Date: Wed, 8 Oct 2025 16:53:34 +0200 Subject: [PATCH] Viewports: fixed crsah in UpdateTryMergeWindowIntoHostViewport(). (#8948) Amend e7aa0de. Reproed in "testengine_cov_perftool". --- imgui.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/imgui.cpp b/imgui.cpp index de428e423..4a1e25cfe 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -16424,8 +16424,9 @@ static bool ImGui::UpdateTryMergeWindowIntoHostViewport(ImGuiWindow* window, ImG if (viewport_2 == viewport || viewport_2 == window->Viewport) continue; if (viewport_2->GetMainRect().Overlaps(window->Rect())) - if (IsViewportAbove(viewport_2, viewport) && !IsViewportAbove(viewport_2, window->Viewport)) - return false; + if (IsViewportAbove(viewport_2, viewport)) + if (window->Viewport == NULL || !IsViewportAbove(viewport_2, window->Viewport)) + return false; } // Move to the existing viewport, Move child/hosted windows as well (FIXME-OPT: iterate child)