Ticket #3446: t3446_catch_SDL_QUIT_v1.patch

binaries/data/mods/public/gui/replaymenu/replay_menu.js

@@ -41 +41 @@
 
     // By default, sort replays by date in descending order
     Engine.GetGUIObjectByName("replaySelection").selected_column_order = -1;
 
     loadReplays();
+
+    if (!g_Replays)
+    {
+        Engine.SwitchGuiPage("page_pregame.xml");
+        return;
+    }
+
     displayReplayList();
 }
 
 /**
  * Store the list of replays loaded in C++ in g_Replays.
@@ -52 +59 @@
  */
 function loadReplays()
 {
     g_Replays = Engine.GetReplays();
 
+    if (!g_Replays)
+        return;
+
     g_Playernames = [];
     for (let replay of g_Replays)
     {
         // Use time saved in file, otherwise file mod date
         replay.timestamp = replay.attribs.timestamp ? +replay.attribs.timestamp : +replay.filemod_timestamp;

source/ps/VisualReplay.cpp

@@ -19 +19 @@
 
 #include "VisualReplay.h"
 #include "graphics/GameView.h"
 #include "gui/GUIManager.h"
 #include "lib/allocators/shared_ptr.h"
+#include "lib/external_libraries/libsdl.h"
 #include "lib/utf8.h"
 #include "ps/CLogger.h"
 #include "ps/Filesystem.h"
 #include "ps/Game.h"
 #include "ps/Pyrogenesis.h"
@@ -50 +51 @@
     JSContext* cx = scriptInterface.GetContext();
     JSAutoRequest rq(cx);
 
     u32 i = 0;
     DirectoryNames directories;
+
+    SDL_Event event;
     JS::RootedObject replays(cx, JS_NewArrayObject(cx, 0));
+
     if (GetDirectoryEntries(GetDirectoryName(), NULL, &directories) == INFO::OK)
         for (OsPath& directory : directories)
         {
+            if (SDL_PollEvent(&event) && event.type == SDL_QUIT)
+                return JSVAL_NULL;
+
             JS::RootedValue replayData(cx, LoadReplayData(scriptInterface, directory));
             if (!replayData.isNull())
                 JS_SetElement(cx, replays, i++, replayData);
         }
     return JS::ObjectValue(*replays);