game/ui: Fix CheckCurrentScreen check

This changes ui::CheckCurrentScreen to also check that the screen is not closing, which fixes a softlock in the Bomber's Notebook if the map is opened while the screen is closing. Closes #129
leoetlino · Apr 25, 2020 · ac45fa5 · ac45fa5
1 parent fe301d4
commit ac45fa5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/source/game/ui.cpp b/source/game/ui.cpp
@@ -62,7 +62,8 @@ bool OpenScreen(ScreenType screen) {
 }
 
 bool CheckCurrentScreen(ScreenType screen) {
-  return GetScreenContext().active_screen == GetScreen(screen);
+  auto& ctx = GetScreenContext();
+  return ctx.active_screen == GetScreen(screen) && !ctx.new_screen;
 }
 
 void LayoutBase::calc(float speed) {

diff --git a/source/game/ui.h b/source/game/ui.h
@@ -49,6 +49,7 @@ enum class ScreenType {
 };
 Screen* GetScreen(ScreenType screen);
 bool OpenScreen(ScreenType screen);
+/// Check whether the specified screen is active and not closing.
 bool CheckCurrentScreen(ScreenType screen);
 
 ScreenContext& GetScreenContext();