[Freecol-commits] SF.net SVN: freecol:[9854] freecol/trunk/src/net/sf/freecol/client/control/ InGameController.java

[<mp...@us...>]

Revision: 9854
          http://freecol.svn.sourceforge.net/freecol/?rev=9854&view=rev
Author:   mpope
Date:     2012-05-25 10:37:08 +0000 (Fri, 25 May 2012)
Log Message:
-----------
Unstick UI after skip command.

Modified Paths:
--------------
    freecol/trunk/src/net/sf/freecol/client/control/InGameController.java

Modified: freecol/trunk/src/net/sf/freecol/client/control/InGameController.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/client/control/InGameController.java	2012-05-25 10:34:19 UTC (rev 9853)
+++ freecol/trunk/src/net/sf/freecol/client/control/InGameController.java	2012-05-25 10:37:08 UTC (rev 9854)
@@ -1976,14 +1976,9 @@
             .getBoolean(ClientOptions.SHOW_END_TURN_DIALOG)) {
             List<Unit> units = new ArrayList<Unit>();
             for (Unit unit : freeColClient.getMyPlayer().getUnits()) {
-                if (unit.couldMove()) {
-                    units.add(unit);
-                }
+                if (unit.couldMove()) units.add(unit);
             }
-            if (units.size() > 0) {
-                if (!gui.showEndTurnDialog(units))
-                    return;
-            }
+            if (!units.isEmpty() && !gui.showEndTurnDialog(units)) return;
         }
 
         // Ensure end-turn mode sticks.
@@ -3709,7 +3704,11 @@
      * Skip a unit.
      */
     public void skipActiveUnit() {
-        changeState(gui.getActiveUnit(), UnitState.SKIPPED);
+        final Unit unit = gui.getActiveUnit();
+        if (unit != null && unit.getState() != UnitState.SKIPPED) {
+            unit.setState(UnitState.SKIPPED);
+        }
+        nextActiveUnit();
     }
 
     /**

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.