Fix merge issue on master.

This commit is contained in:
omar 2018-12-18 15:11:11 +01:00
parent ae76a1fda7
commit ca953f0fee

View File

@ -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)
{