commit | ca953f0fee93f7947f804018493fc34cac8538d4 | [log] [tgz] |
---|---|---|
author | omar <omarcornut@gmail.com> | Tue Dec 18 15:11:11 2018 +0100 |
committer | omar <omarcornut@gmail.com> | Tue Dec 18 15:11:11 2018 +0100 |
tree | fdd3895db5639f3965ca0fc8fa84853e63637eda | |
parent | ae76a1fda7e0caccad70b03933dcdf0199810d88 [diff] |
Fix merge issue on master.
diff --git a/imgui.cpp b/imgui.cpp index caa8526..5676ae3 100644 --- a/imgui.cpp +++ b/imgui.cpp
@@ -7374,7 +7374,7 @@ { // 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) {