From 3f55b618659f7109a76fd24ef86a2b71cf79f1d8 Mon Sep 17 00:00:00 2001 From: Peter Osterlund Date: Sun, 14 Apr 2013 20:59:45 +0000 Subject: [PATCH] DroidFish: Enable "load from last file" action even if clocks are active. --- DroidFish/src/org/petero/droidfish/DroidFish.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/DroidFish/src/org/petero/droidfish/DroidFish.java b/DroidFish/src/org/petero/droidfish/DroidFish.java index e846b47..96fbfd6 100644 --- a/DroidFish/src/org/petero/droidfish/DroidFish.java +++ b/DroidFish/src/org/petero/droidfish/DroidFish.java @@ -2535,7 +2535,7 @@ public class DroidFish extends Activity implements GUIInterface { } final int currFT = currFileType(); final String currPathName = currPathName(); - if (currFT != FT_NONE) { + if ((currFT != FT_NONE) && !gameMode.clocksActive()) { lst.add(getString(R.string.load_prev_game)); actions.add(LOAD_PREV_GAME); } final List finalActions = actions; @@ -2586,7 +2586,7 @@ public class DroidFish extends Activity implements GUIInterface { } final int currFT = currFileType(); final String currPathName = currPathName(); - if (currFT != FT_NONE) { + if ((currFT != FT_NONE) && !gameMode.clocksActive()) { lst.add(getString(R.string.load_next_game)); actions.add(LOAD_NEXT_GAME); } final List finalActions = actions; @@ -2999,10 +2999,7 @@ public class DroidFish extends Activity implements GUIInterface { final static int FT_FEN = 3; private final int currFileType() { - if (gameMode.clocksActive()) - return FT_NONE; - int ft = settings.getInt("currFT", FT_NONE); - return ft; + return settings.getInt("currFT", FT_NONE); } /** Return path name for the last used PGN or SCID file. */