Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-15 15:41:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix confirm-changes-that-lose-turns logic so doesn't require

Browse source 
confirmation if no moves yet made.
This commit is contained in:
eehouse 2010-04-08 04:13:41 +00:00
parent 1deda80a9c
commit bf0f217460
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfig.java
View file

@ -532,19 +532,18 @@ public class GameConfig extends Activity implements View.OnClickListener {
boolean consumed = false;
if ( keyCode == KeyEvent.KEYCODE_BACK ) {
saveChanges();
if ( 0 <= m_nMoves && (m_giOrig.changesMatter(m_gi)
|| m_carOrig.changesMatter(m_car) ) ) {
if ( 0 <= m_nMoves ) { // no confirm needed
applyChanges( true );
} else if ( m_giOrig.changesMatter(m_gi)
|| m_carOrig.changesMatter(m_car) ) {
showDialog( CONFIRM_CHANGE );
consumed = true;
consumed = true; // don't dismiss activity yet!
} else {
applyChanges( false );
}
}
if ( !consumed ) {
consumed = super.onKeyDown( keyCode, event );
}
return consumed;
return consumed || super.onKeyDown( keyCode, event );
}
@Override