[Rails-commits] rails/ui

[Erik V. <ev...@us...>]

 rails/ui/swing/ORUIManager.java |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 7394b2bb745bfd1cc665fb3ee5513f7a9461c6e2
Author: Erik Vos <eri...@xs...>
Date:   Tue Apr 3 15:32:06 2012 +0200

    Fixed: after 'Destinations reached' dialog with no checks, buttons remained disabled.
    
    Reported by John David Galt.

diff --git a/rails/ui/swing/ORUIManager.java b/rails/ui/swing/ORUIManager.java
index 0c634df..0224995 100644
--- a/rails/ui/swing/ORUIManager.java
+++ b/rails/ui/swing/ORUIManager.java
@@ -9,9 +9,7 @@ import org.apache.log4j.Logger;
 import org.jgrapht.graph.SimpleGraph;
 
 import rails.algorithms.*;
-import rails.common.Config;
-import rails.common.GuiDef;
-import rails.common.LocalText;
+import rails.common.*;
 import rails.game.*;
 import rails.game.action.*;
 import rails.game.correct.*;
@@ -590,12 +588,13 @@ public class ORUIManager implements DialogOwner {
 
             // Prevent that a null action gets processed
             if (action.getReachedCompanies() == null
-                    || action.getReachedCompanies().isEmpty()) return;
+                    || action.getReachedCompanies().isEmpty()) currentDialogAction = null;
 
         } else {
-            return;
+            currentDialogAction = null;
         }
 
+        // Required even if no action is executed, to update the UI, re-enable buttons etc.
         gameUIManager.processAction(currentDialogAction);
     }