fix NRE in CancelableActivity

2010-10-10 11:04:39 +13:00
parent 70f6fc7a7a
commit 0d8557eadb
1 changed files with 1 additions and 1 deletions
--- a/OpenRA.Game/Traits/TraitsInterfaces.cs
+++ b/OpenRA.Game/Traits/TraitsInterfaces.cs
@@ -188,7 +188,7 @@ namespace OpenRA.Traits
 			IsCanceled = OnCancel();
 			if( IsCanceled )
 				NextActivity = null;
-			else
+			else if (NextActivity != null)
 				NextActivity.Cancel( self );
 		}