Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-08-03 10:33:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge issue on master.

Browse Source
This commit is contained in:
omar
2018-12-18 15:11:11 +01:00
parent ae76a1fda7
commit ca953f0fee
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
imgui.cpp
View File

@ -7374,7 +7374,7 @@ static void ImGui::NavUpdate()
{ {
// Close open popup/menu // Close open popup/menu
if (!(g.OpenPopupStack.back().Window->Flags & ImGuiWindowFlags_Modal)) if (!(g.OpenPopupStack.back().Window->Flags & ImGuiWindowFlags_Modal))
ClosePopupToLevel(g.OpenPopupStack.Size - 1); ClosePopupToLevel(g.OpenPopupStack.Size - 1, true);
} }
else if (g.NavLayer != 0) else if (g.NavLayer != 0)
{ {