2 files changed, 10 insertions, 4 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/states/StateRotate.java b/core/src/ch/asynk/rustanddust/game/states/StateRotate.java
index acd2539..a2a8af7 100644
--- a/core/src/ch/asynk/rustanddust/game/states/StateRotate.java
+++ b/core/src/ch/asynk/rustanddust/game/states/StateRotate.java
@@ -71,8 +71,11 @@ public class StateRotate extends StateCommon
 
         StateType whenDone = StateType.DONE;
 
-        if (map.moveUnit(activeUnit) > 0)
-            whenDone = StateType.MOVE;
+        if (map.moveUnit(activeUnit)) {
+            if (map.unitsActivableSize() > 0)
+                whenDone = StateType.MOVE;
+        } else
+            RustAndDust.debug("rotate failed");
 
         ctrl.setAfterAnimationState(whenDone);
         return StateType.ANIMATION;
diff --git a/core/src/ch/asynk/rustanddust/game/states/StateWithdraw.java b/core/src/ch/asynk/rustanddust/game/states/StateWithdraw.java
index ad67a83..f21fbed 100644
--- a/core/src/ch/asynk/rustanddust/game/states/StateWithdraw.java
+++ b/core/src/ch/asynk/rustanddust/game/states/StateWithdraw.java
@@ -54,8 +54,11 @@ public class StateWithdraw extends StateCommon
         map.movesHide();
         map.hexUnselect(hex);
 
-        if (map.exitBoard(unit) > 0)
-            return StateType.MOVE;
+        if (map.exitBoard(unit)) {
+            if (map.unitsActivableSize() > 0)
+                return StateType.MOVE;
+        } else
+            RustAndDust.debug("exit failed");
         return StateType.DONE;
     }
 }