From 8931a4c94f6774edcd45e2d84572eae5a53bcb43 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Sun, 3 Jan 2010 23:37:34 +1300
Subject: [PATCH] only say 'Select Target' when pushing chrono, not canceling
 it

---
 OpenRa.Game/Chrome.cs     | 4 ++--
 OpenRa.Game/Controller.cs | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/OpenRa.Game/Chrome.cs b/OpenRa.Game/Chrome.cs
index c9d626ad38..06bf3bfd6c 100644
--- a/OpenRa.Game/Chrome.cs
+++ b/OpenRa.Game/Chrome.cs
@@ -293,8 +293,8 @@ namespace OpenRa.Game
 		
 		void HandleChronosphereButton()
 		{
-			Sound.Play("slcttgt1.aud");
-			Game.controller.ToggleInputMode<ChronosphereSelectOrderGenerator>();
+			if (Game.controller.ToggleInputMode<ChronosphereSelectOrderGenerator>())
+				Sound.Play("slcttgt1.aud");
 		}
 		
 		void DrawChat()
diff --git a/OpenRa.Game/Controller.cs b/OpenRa.Game/Controller.cs
index cbe2d35fa3..2653cc28d3 100644
--- a/OpenRa.Game/Controller.cs
+++ b/OpenRa.Game/Controller.cs
@@ -27,12 +27,18 @@ namespace OpenRa.Game
 			orderGenerator = new UnitOrderGenerator(new Actor[] { });
 		}
 
-		public void ToggleInputMode<T>() where T : IOrderGenerator, new()
+		public bool ToggleInputMode<T>() where T : IOrderGenerator, new()
 		{
 			if (orderGenerator is T)
+			{
 				CancelInputMode();
+				return false;
+			}
 			else
+			{
 				orderGenerator = new T();
+				return true;
+			}
 		}
 
 		List<Order> recentOrders = new List<Order>();