Fix HideMapNamePopUpWindow possible overflow

2024-02-02 22:31:20 +01:00
parent 5be69b2713
commit e87a69a5e7
2 changed files with 7 additions and 7 deletions
--- a/src/map_name_popup.c
+++ b/src/map_name_popup.c
@@ -317,8 +317,13 @@ void HideMapNamePopUpWindow(void)
 {
    if (FuncIsActiveTask(Task_MapNamePopUpWindow))
    {
-        ClearStdWindowAndFrame(GetMapNamePopUpWindowId(), TRUE);
-        RemoveMapNamePopUpWindow();
+    #ifdef UBFIX
+        if (GetMapNamePopUpWindowId() != WINDOW_NONE)
+    #endif // UBFIX
+        {
+            ClearStdWindowAndFrame(GetMapNamePopUpWindowId(), TRUE);
+            RemoveMapNamePopUpWindow();
+        }
        SetGpuReg_ForcedBlank(REG_OFFSET_BG0VOFS, 0);
        DestroyTask(sPopupTaskId);
    }