Bug fix: Changing theme on this day game opens main menu

app/src/main/java/org/wikipedia/games/onthisday/OnThisDayGameActivity.kt

@@ -73,11 +73,16 @@ class OnThisDayGameActivity : BaseActivity(), BaseActivity.Callback {
             }
             windowInsets
         }
-
-        supportFragmentManager.beginTransaction()
-            .replace(R.id.fragmentContainer, OnThisDayGameMainMenuFragment.newInstance(viewModel.invokeSource), null)
-            .addToBackStack(null)
-            .commit()
+        if (savedInstanceState == null) {
+            supportFragmentManager.beginTransaction()
+                .replace(
+                    R.id.fragmentContainer,
+                    OnThisDayGameMainMenuFragment.newInstance(viewModel.invokeSource),
+                    null
+                )
+                .addToBackStack(null)
+                .commit()
+        }
         hideAppBarDateText()
     }
 

app/src/main/java/org/wikipedia/games/onthisday/OnThisDayGamePlayFragment.kt

@@ -163,6 +163,7 @@ class OnThisDayGamePlayFragment : Fragment() {
     }
 
     private fun onCurrentQuestionCorrect(gameState: OnThisDayGameViewModel.GameState) {
+        updateInitialScores(gameState)
         updateGameState(gameState)
 
         updateQuestionEndLayout()
@@ -183,6 +184,7 @@ class OnThisDayGamePlayFragment : Fragment() {
     }
 
     private fun onCurrentQuestionIncorrect(gameState: OnThisDayGameViewModel.GameState) {
+        updateInitialScores(gameState)
         updateGameState(gameState)
 
         updateQuestionEndLayout()