Ticket #3437: rejoining_replay.patch

binaries/data/mods/public/gui/session/session.js

@@ -33 +33 @@
 var g_IsObserver = false;
 
 /**
+ * True if user has rejoined
+ */
+var g_HasRejoined
+
+/**
  * The playerID selected in the change perspective tool.
  */
 var g_ViewedPlayer = Engine.GetPlayerID();
@@ -218 +223 @@
         g_PlayerAssignments = initData.playerAssignments;
         g_MatchID = initData.attribs.matchID;
         g_ReplaySelectionData = initData.replaySelectionData;
+        g_HasRejoined = initData.isRejoining;
 
         // Cache the player data
         // (This may be updated at runtime by handleNetMessage)
@@ -478 +484 @@
     if (!g_IsReplay)
         Engine.SaveReplayMetadata(JSON.stringify(summary));
 
-    summary.replayDirectory = Engine.GetCurrentReplayDirectory();
+    if(!g_HasRejoined)
+        summary.replayDirectory = Engine.GetCurrentReplayDirectory();
     summary.replaySelectionData = g_ReplaySelectionData;
 
     Engine.EndGame();