Merge pull request #8330 from Mailaender/gametimer-nre

Fixed a NullReferenceException in GameTimeLogic
2015-06-01 01:59:32 +03:00
parent c11214f697 14a4b876e3
commit 926900d3f9
1 changed files with 1 additions and 1 deletions
--- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameTimerLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/GameTimerLogic.cs
@@ -61,7 +61,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
 				var connection = orderManager.Connection as ReplayConnection;
 				if (connection != null && connection.TickCount != 0)
 					percentage.GetText = () => "({0}%)".F(orderManager.NetFrameNumber * 100 / connection.TickCount);
-				else
+				else if (timer != null)
 					timer.Bounds.Width += percentage.Bounds.Width;
 			}
 		}