From aa9eea16e02c5d380e9bfe6a0f5573021dc45b21 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 15 Jun 2006 06:38:24 +0000 Subject: [PATCH] more nudging: merge DeviceButtonToString calls --- stepmania/src/arch/InputHandler/InputHandler.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/stepmania/src/arch/InputHandler/InputHandler.cpp b/stepmania/src/arch/InputHandler/InputHandler.cpp index b071bb464a..34347a9719 100644 --- a/stepmania/src/arch/InputHandler/InputHandler.cpp +++ b/stepmania/src/arch/InputHandler/InputHandler.cpp @@ -125,10 +125,11 @@ RString InputHandler::GetDeviceSpecificInputString( const DeviceInput &di ) wchar_t c = DeviceButtonToChar( di.button, false ); if( c && c != L' ' ) // Don't show "Key " for space. return InputDeviceToString(di.device) + " " + + Capitalize( WStringToRString(wstring()+c) ); - return DeviceButtonToString( di.button ); } - RString s = InputDeviceToString(di.device) + " " + DeviceButtonToString(di.button); + RString s = DeviceButtonToString(di.button); + if( di.device != DEVICE_KEYBOARD ) + InputDeviceToString(di.device) + " " + s; return s; }