Better display of game index 0

diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayLocal.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayLocal.java
index 90931d356d6dc128f8bb0b230612c0dc92f66822..0e8f923216345c1dc9af5c7378fbea1ae0328ffc 100644 (file)
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayLocal.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/CtFwSDisplayLocal.java
@@ -78,7 +78,7 @@ class CtFwSDisplayLocal implements CtFwSGameStateManager.Observer {
             nr = now.rationale;
         }
 
-        if (nr == CtFwSGameStateManager.NowRationale.NR_NOT_CONFIG || gameIndex == 0) {
+        if (nr == CtFwSGameStateManager.NowRationale.NR_NOT_CONFIG) {
             gameStateLabelText = String.format(rs.getString(R.string.header_gamestate0),
                     rs.getString(R.string.notify_not_config));
         } else {
@@ -109,8 +109,13 @@ class CtFwSDisplayLocal implements CtFwSGameStateManager.Observer {
                     sfx = "";
             }
 
-            gameStateLabelText = String.format(rs.getString(R.string.header_gamestateN),
-                    gameIndex, sfx);
+            if (gameIndex == 0) {
+                gameStateLabelText = String.format(rs.getString(R.string.header_gamestate0),
+                        sfx);
+            } else {
+                gameStateLabelText = String.format(rs.getString(R.string.header_gamestateN),
+                        gameIndex, sfx);
+            }
         }
 
         final TextView gstv = mAct.findViewById(R.id.header_gamestate);