Fix and test OpenEnroth#1454

pskelton · Dec 27, 2023 · 36308eb · 36308eb
1 parent 3fe1862
commit 36308eb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/GUI/UI/Books/MapBook.cpp b/src/GUI/UI/Books/MapBook.cpp
@@ -27,6 +27,7 @@ void DrawBook_Map_sub(unsigned int tl_x, unsigned int tl_y, unsigned int br_x, i
 GraphicsImage *ui_book_map_background = nullptr;
 
 GUIWindow_MapBook::GUIWindow_MapBook() {
+    this->eWindowType = WindowType::WINDOW_MapsBook;
     viewparams->sViewCenterX = pParty->pos.x;
     viewparams->sViewCenterY = pParty->pos.y;
     pChildBooksOverlay = new GUIWindow_BooksButtonOverlay({546, 353}, {0, 0}, pBtn_Maps);

diff --git a/test/Bin/GameTest/GameTests_1000.cpp b/test/Bin/GameTest/GameTests_1000.cpp
@@ -500,3 +500,17 @@ GAME_TEST(Prs, Pr1440) {
     for (int i = 24; i < 32; i++)
         EXPECT_EQ(table.GetFrameTexture(0, Duration::fromTicks(i)), tex1) << i;
 }
+
+GAME_TEST(Issues, Issue1454) {
+    // Map hotkey doesn't close the map
+    game.startNewGame();
+    game.tick(1);
+    game.pressAndReleaseKey(PlatformKey::KEY_M);
+    game.tick(1);
+    EXPECT_EQ(current_screen_type, ScreenType::SCREEN_BOOKS);
+    EXPECT_EQ(pGUIWindow_CurrentMenu->eWindowType, WindowType::WINDOW_MapsBook);
+    game.pressAndReleaseKey(PlatformKey::KEY_M);
+    game.tick(1);
+    EXPECT_EQ(current_screen_type, ScreenType::SCREEN_GAME);
+    EXPECT_EQ(pGUIWindow_CurrentMenu, nullptr);
+}