From a3efa94b2a7a30e152a68fe47f49ad10268be431 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Fri, 9 Dec 2005 03:05:17 +0000
Subject: [PATCH] return true if something changed

---
 stepmania/src/InputMapper.cpp | 10 +++++++---
 stepmania/src/InputMapper.h   |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/stepmania/src/InputMapper.cpp b/stepmania/src/InputMapper.cpp
index ff77574b6f..9f06f499fc 100644
--- a/stepmania/src/InputMapper.cpp
+++ b/stepmania/src/InputMapper.cpp
@@ -545,14 +545,18 @@ void InputMapper::ClearFromInputMap( const DeviceInput &DeviceI )
 	UpdateTempDItoGI();
 }
 
-void InputMapper::ClearFromInputMap( const GameInput &GameI, int iSlotIndex )
+bool InputMapper::ClearFromInputMap( const GameInput &GameI, int iSlotIndex )
 {
 	if( !GameI.IsValid() )
-		return;
+		return false;
 
-	m_GItoDI[GameI.controller][GameI.button][iSlotIndex].MakeInvalid();
+	DeviceInput &di = m_GItoDI[GameI.controller][GameI.button][iSlotIndex];
+	if( !di.IsValid() )
+		return false;
+	di.MakeInvalid();
 
 	UpdateTempDItoGI();
+	return true;
 }
 
 bool InputMapper::IsMapped( const DeviceInput &DeviceI )
diff --git a/stepmania/src/InputMapper.h b/stepmania/src/InputMapper.h
index b2fca04b3d..ce9c8e768e 100644
--- a/stepmania/src/InputMapper.h
+++ b/stepmania/src/InputMapper.h
@@ -27,7 +27,7 @@ public:
 
 	void SetInputMap( const DeviceInput &DeviceI, const GameInput &GameI, int iSlotIndex );
 	void ClearFromInputMap( const DeviceInput &DeviceI );
-	void ClearFromInputMap( const GameInput &GameI, int iSlotIndex );
+	bool ClearFromInputMap( const GameInput &GameI, int iSlotIndex );
 
 	void AddDefaultMappingsForCurrentGameIfUnmapped();
 	void AutoMapJoysticksForCurrentGame();