fix crash in replay playback (no world)

Mailaender · Dec 19, 2010 · 5f37b9e · 5f37b9e
1 parent 734b464
commit 5f37b9e
Showing 1 changed file with 21 additions and 17 deletions.
diff --git a/OpenRA.Game/Game.cs b/OpenRA.Game/Game.cs
@@ -135,29 +135,33 @@ private static void Tick( OrderManager orderManager )
 					Sound.Tick();
 					Sync.CheckSyncUnchanged( world, () => { orderManager.TickImmediate(); } );
 
-					var isNetTick = LocalTick % NetTickScale == 0;
-
-					if( !isNetTick || orderManager.IsReadyForNextFrame )
+					if (world != null)
 					{
-						++orderManager.LocalFrameNumber;
+						var isNetTick = LocalTick % NetTickScale == 0;
+
+						if (!isNetTick || orderManager.IsReadyForNextFrame)
+						{
+							++orderManager.LocalFrameNumber;
+
+							Log.Write("debug", "--Tick: {0} ({1})", LocalTick, isNetTick ? "net" : "local");
+
+							if (isNetTick) orderManager.Tick();
 
-						Log.Write( "debug", "--Tick: {0} ({1})", LocalTick, isNetTick ? "net" : "local" );
 
-						if( isNetTick ) orderManager.Tick();
+							Sync.CheckSyncUnchanged(world, () =>
+								{
+									world.OrderGenerator.Tick(world);
+									world.Selection.Tick(world);
+								});
 
-						Sync.CheckSyncUnchanged(world, () =>
-							{
-								world.OrderGenerator.Tick(world);
-								world.Selection.Tick(world);
-							});
-
-						world.Tick();
+							world.Tick();
 
-						PerfHistory.Tick();
+							PerfHistory.Tick();
+						}
+						else
+							if (orderManager.NetFrameNumber == 0)
+								orderManager.LastTickTime = Environment.TickCount;
 					}
-					else
-						if( orderManager.NetFrameNumber == 0 )
-							orderManager.LastTickTime = Environment.TickCount;
 				}
 		}