Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-27 09:58:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix NPEs that would occur if play and back buttons pressed at about

Browse source 
the same time by ignoring the second if we've already closed the game
being edited.
This commit is contained in:
Eric House 2012-03-04 08:18:54 -08:00
parent 542f10a3e5
commit ef0c301e1a
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -577,7 +577,9 @@ public class GameConfig extends XWActivity
public void onClick( View view )
{
if ( m_addPlayerButton == view ) {
if ( null == m_gameLock ) {
// do nothing; we're on the way out
} else if ( m_addPlayerButton == view ) {
int curIndex = m_gi.nPlayers;
if ( curIndex < CurGameInfo.MAX_NUM_PLAYERS ) {
m_gi.addPlayer(); // ups nPlayers
@ -621,7 +623,9 @@ public class GameConfig extends XWActivity
public boolean onKeyDown( int keyCode, KeyEvent event )
{
boolean consumed = false;
if ( keyCode == KeyEvent.KEYCODE_BACK ) {
if ( null == m_gameLock ) {
// Do nothing; we're on our way out
} else if ( keyCode == KeyEvent.KEYCODE_BACK ) {
saveChanges();
if ( !m_gameStarted ) { // no confirm needed
applyChanges( true );