From 71a035315cd13bf04bd02b885ecab288663e9b59 Mon Sep 17 00:00:00 2001
From: tovl <tomvanleth@gmail.com>
Date: Sun, 26 May 2019 19:01:48 +0200
Subject: [PATCH] Prevent infinite loop between FlyAttack and ReturnToBase.

---
 OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs b/OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs
index 77cc49531e..7492ed0f90 100644
--- a/OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs
+++ b/OpenRA.Mods.Common/Activities/Air/ReturnToBase.cs
@@ -126,7 +126,7 @@ namespace OpenRA.Mods.Common.Activities
 				}
 
 				// Prevent an infinite loop in case we'd return to the activity that called ReturnToBase in the first place. Go idle instead.
-				Cancel(self);
+				self.CancelActivity();
 				return NextActivity;
 			}