From 5d48f4fa21ff3c7a82e12d65fa5f55eb0e4864dc Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Mon, 1 Feb 2016 03:45:42 +0000
Subject: [PATCH] Fix animation for new conquest screen

---
 .../src/forge/screens/MultiStepWizardScreen.java         | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/forge-gui-mobile/src/forge/screens/MultiStepWizardScreen.java b/forge-gui-mobile/src/forge/screens/MultiStepWizardScreen.java
index cad1791c1dc..039e77c936e 100644
--- a/forge-gui-mobile/src/forge/screens/MultiStepWizardScreen.java
+++ b/forge-gui-mobile/src/forge/screens/MultiStepWizardScreen.java
@@ -73,9 +73,9 @@ public abstract class MultiStepWizardScreen<T> extends FScreen {
         setCurrentStep(newIndex);
     }
 
-    private void setCurrentStep(int index) {
+    private boolean setCurrentStep(int index) {
         if (currentStep != null) {
-            if (currentStep.index == index) { return; }
+            if (currentStep.index == index) { return false; }
 
             currentStep.setVisible(false);
             if (currentStep.index == steps.length - 1) {
@@ -95,6 +95,7 @@ public abstract class MultiStepWizardScreen<T> extends FScreen {
         if (Forge.getCurrentScreen() == this) {
             currentStep.onActivate(model);
         }
+        return true;
     }
 
     @Override
@@ -103,7 +104,9 @@ public abstract class MultiStepWizardScreen<T> extends FScreen {
         for (WizardStep<T> step : steps) {
             step.reset();
         }
-        setCurrentStep(0);
+        if (!setCurrentStep(0)) {
+            currentStep.onActivate(model); //ensure first step activated even if already selected
+        }
     }
 
     protected abstract void finish();