Merge branch 'dev' of https://github.com/mkdasher/mupen64-rr-lua- int…

…o dev
mkdasher · Jun 2, 2023 · 7adfa12 · 7adfa12
2 parents 9468af0 + 84aedf5
commit 7adfa12
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/main/win/main_win.cpp b/main/win/main_win.cpp
@@ -1484,11 +1484,15 @@ DWORD WINAPI closeRom(LPVOID lpParam) //lpParam - treated as bool, show romlist?
         	clear_sram_on_restart_mode = FALSE;
 		}
 
-       really_restart_mode = FALSE;
-       extern int m_task;
-       if (m_task!=0)
-        just_restarted_flag = TRUE;
-       StartRom(LastSelectedRom);
+        really_restart_mode = FALSE;
+        extern int m_task;
+        if (m_task!=0)
+           just_restarted_flag = TRUE;
+        if (StartRom(LastSelectedRom)) { // If rom loading fails
+           closeRom(lpParam);
+           ShowRomBrowser(TRUE, TRUE);
+           SetStatusTranslatedString(hStatus, 0, "Failed to open rom");
+        }
       }
    }