efa81bc: don't filter NoteSkins at a PrefsManager/NoteSkinManager level. Leave the NoteSkin sorting and filtering up to the theme. [Chris Danford]

ScreenWithMenuElements.cpp - add Cancel command, so actors can react to Cancel.
GameState.cpp - cleanup
This commit is contained in:
AJ Kelly
2010-02-19 16:05:50 -06:00
parent 2c19a3fab1
commit c43635b6b3
7 changed files with 8 additions and 16 deletions
+2
View File
@@ -313,6 +313,8 @@ void ScreenWithMenuElements::Cancel( ScreenMessage smSendWhenDone )
return;
}
this->PlayCommand( "Cancel" );
if( m_Cancel.IsTransitioning() )
return; // ignore