Ticket #3427: t3427_improve_replay_error_v1.patch

source/main.cpp

@@ -436 +436 @@
 static void RunGameOrAtlas(int argc, const char* argv[])
 {
     CmdLineArgs args(argc, argv);
 
     g_args = args;
 
     // We need to initialise libxml2 in the main thread before
     // any thread uses it. So initialise it here before we
     // might run Atlas.
     CXeromyces::Startup();
 
     // run Atlas (if requested via args)
-    bool ran_atlas = ATLAS_RunIfOnCmdLine(args, false);
     // Atlas handles the whole init/shutdown/etc sequence by itself;
     // when we get here, it has exited and we're done.
-    if(ran_atlas)
+    if (ATLAS_RunIfOnCmdLine(args, false))
         return;
 
-    // run non-visual simulation replay if requested
-    if (args.Has("replay"))
+    const bool isReplay = args.Has("replay");
+    const bool isVisualReplay = args.Has("replay-visual");
+    const std::string replayFile = isReplay ? args.Get("replay") : (isVisualReplay ? args.Get("replay-visual") : "");
+
+    // Ensure the replay file exists
+    if (isReplay || isVisualReplay)
     {
-        std::string replayFile = args.Get("replay");
         if (!FileExists(OsPath(replayFile)))
         {
             debug_printf("ERROR: The requested replay file '%s' does not exist!\n", replayFile.c_str());
             return;
         }
+        if (DirectoryExists(OsPath(replayFile)))
+        {
+            debug_printf("ERROR: The requested replay file '%s' is a directory!\n", replayFile.c_str());
+            return;
+        }
+    }
+
+    // run non-visual simulation replay if requested
+    if (isReplay)
+    {
         Paths paths(args);
         g_VFS = CreateVfs(20 * MiB);
         g_VFS->Mount(L"cache/", paths.Cache(), VFS_MOUNT_ARCHIVABLE);
         MountMods(paths, GetMods(args, INIT_MODS));
 
         {
             CReplayPlayer replay;
             replay.Load(replayFile);
             replay.Replay(args.Has("serializationtest"), args.Has("ooslog"));
         }
 
         g_VFS.reset();
 
         CXeromyces::Terminate();
         return;
     }
 
-    // If visual replay file does not exist, quit before starting the renderer
-    if (args.Has("replay-visual"))
-    {
-        std::string replayFile = args.Get("replay-visual");
-        if (!FileExists(OsPath(replayFile)))
-        {
-            debug_printf("ERROR: The requested replay file '%s' does not exist!\n", replayFile.c_str());
-            return;
-        }
-    }
-
     // run in archive-building mode if requested
     if (args.Has("archivebuild"))
     {
         Paths paths(args);
 
         OsPath mod(args.Get("archivebuild"));
         OsPath zip;
         if (args.Has("archivebuild-output"))
             zip = args.Get("archivebuild-output");
         else
             zip = mod.Filename().ChangeExtension(L".zip");