Merge pull request #5415 from pavlos256/replayrecorder-disposing-crash

Fix #5414

OpenRA.Game/Network/OrderManager.cs

@@ -198,16 +198,21 @@ namespace OpenRA.Network
 		}
 
 		bool disposed;
-		public void Dispose()
+		protected void Dispose(bool disposing)
 		{
-			if (disposed) return;
+			if (disposed)
+				return;
 
+			if (disposing)
 				Connection.Dispose();
 
 			disposed = true;
-			GC.SuppressFinalize(this);
 		}
 
-		~OrderManager() { Dispose(); }
+		public void Dispose()
+		{
+			Dispose(true);
+			GC.SuppressFinalize(this);
+		}
 	}
 }

OpenRA.Game/Network/ReplayRecorderConnection.cs

@@ -17,7 +17,7 @@ using OpenRA.Widgets;
 
 namespace OpenRA.Network
 {
-	class ReplayRecorderConnection : IConnection
+	class ReplayRecorderConnection : IConnection, IDisposable
 	{
 		public ReplayMetadata Metadata;
 
@@ -98,27 +98,30 @@ namespace OpenRA.Network
 		}
 
 		bool disposed;
-
+		protected void Dispose(bool disposing)
-		public void Dispose()
 		{
 			if (disposed)
 				return;
 
+			if (disposing)
+			{
 				if (Metadata != null)
 				{
 					if (Metadata.GameInfo != null)
 						Metadata.GameInfo.EndTimeUtc = DateTime.UtcNow;
 					Metadata.Write(writer);
 				}
-
 				writer.Close();
 				inner.Dispose();
+			}
+
 			disposed = true;
 		}
 
-		~ReplayRecorderConnection()
+		public void Dispose()
 		{
-			Dispose();
+			Dispose(true);
+			GC.SuppressFinalize(this);
 		}
 	}
 }