From e9880a7f7cc72d21dcba7f7672c46a7d8c5d26de Mon Sep 17 00:00:00 2001 From: Charles Lohr Date: Tue, 25 Jan 2005 06:20:48 +0000 Subject: [PATCH] Fix: Don't crash if we have not yet selected a style. --- stepmania/src/ScreenPrompt.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/stepmania/src/ScreenPrompt.cpp b/stepmania/src/ScreenPrompt.cpp index 6a08758c0a..22d3c9664c 100644 --- a/stepmania/src/ScreenPrompt.cpp +++ b/stepmania/src/ScreenPrompt.cpp @@ -94,7 +94,11 @@ void ScreenPrompt::Input( const DeviceInput& DeviceI, const InputEventType type, if( DeviceI.device==DEVICE_KEYBOARD && type==IET_FIRST_PRESS ) { - PlayerNumber pn = GAMESTATE->GetCurrentStyle()->ControllerToPlayerNumber( GameI.controller ); + PlayerNumber pn; + if ( GAMESTATE->GetCurrentStyle() == NULL ) + pn = (PlayerNumber)GameI.controller; + else + pn = GAMESTATE->GetCurrentStyle()->ControllerToPlayerNumber( GameI.controller ); switch( DeviceI.button ) { case KEY_LEFT: