From 5c4242ac62d335e346e8fa6e031096a1084c666b Mon Sep 17 00:00:00 2001 From: Eric House Date: Tue, 14 Oct 2014 06:31:57 -0700 Subject: [PATCH] Fix (by inspection) NPE reported to google: test for null lock before trying to save its game. Also remove empty overridden method. --- .../org/eehouse/android/xw4/GameConfigDelegate.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigDelegate.java b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigDelegate.java index 1876a17ff..fd74ecc75 100644 --- a/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigDelegate.java +++ b/xwords4/android/XWords4/src/org/eehouse/android/xw4/GameConfigDelegate.java @@ -431,11 +431,6 @@ public class GameConfigDelegate extends DelegateBase m_smartnessSpinner = (Spinner)findViewById( R.id.smart_robot ); } // init - protected void onStart() - { - loadGame(); - } - @Override protected void onResume() { @@ -1112,7 +1107,10 @@ public class GameConfigDelegate extends DelegateBase private void applyChanges( boolean forceNew ) { - GameUtils.applyChanges( m_activity, m_gi, m_car, m_gameLock, forceNew ); + if ( null != m_gameLock ) { + GameUtils.applyChanges( m_activity, m_gi, m_car, m_gameLock, + forceNew ); + } } private void launchGame()