From e852bfaee0c516c644b8ba418974c39e96f9c68b Mon Sep 17 00:00:00 2001
From: drdev <drdev@cardforge.org>
Date: Sun, 6 Dec 2015 01:29:12 +0000
Subject: [PATCH] Fix so plane select resets when going back

---
 forge-gui-mobile/src/forge/screens/MultiStepWizardScreen.java  | 3 +++
 .../forge/screens/planarconquest/ConquestPlaneSelector.java    | 1 +
 2 files changed, 4 insertions(+)

diff --git a/forge-gui-mobile/src/forge/screens/MultiStepWizardScreen.java b/forge-gui-mobile/src/forge/screens/MultiStepWizardScreen.java
index 67fc3b194d7..cad1791c1dc 100644
--- a/forge-gui-mobile/src/forge/screens/MultiStepWizardScreen.java
+++ b/forge-gui-mobile/src/forge/screens/MultiStepWizardScreen.java
@@ -66,6 +66,9 @@ public abstract class MultiStepWizardScreen<T> extends FScreen {
                 return;
             }
         }
+        else {
+            currentStep.reset(); //reset current step before going back
+        }
 
         setCurrentStep(newIndex);
     }
diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneSelector.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneSelector.java
index 4bca362a612..69ef88127a7 100644
--- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneSelector.java
+++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPlaneSelector.java
@@ -56,6 +56,7 @@ public class ConquestPlaneSelector extends FDisplayObject {
         selectedIndex = 0;
         artIndex = 0;
         currentArt = CardRenderer.getCardArt(getSelectedPlane().getPlaneCards().get(artIndex));
+        timer.stop();
     }
 
     @Override