mirror of
https://github.com/ocornut/imgui.git
synced 2025-04-08 06:53:11 +00:00
Fix merge issue on master.
This commit is contained in:
parent
ae76a1fda7
commit
ca953f0fee
1 changed files with 1 additions and 1 deletions
|
@ -7374,7 +7374,7 @@ static void ImGui::NavUpdate()
|
|||
{
|
||||
// Close open popup/menu
|
||||
if (!(g.OpenPopupStack.back().Window->Flags & ImGuiWindowFlags_Modal))
|
||||
ClosePopupToLevel(g.OpenPopupStack.Size - 1);
|
||||
ClosePopupToLevel(g.OpenPopupStack.Size - 1, true);
|
||||
}
|
||||
else if (g.NavLayer != 0)
|
||||
{
|
||||
|
|
Loading…
Add table
Reference in a new issue