From 8b7db062a73a9c73982ffd1a7f13f44a455b08d1 Mon Sep 17 00:00:00 2001
From: Brendan Robert <brobert@alexaconsult.com>
Date: Sun, 4 Aug 2013 21:14:59 -0500
Subject: [PATCH] Tweaking how image selector is handled to improve user
 experience.

---
 .../badvision/outlaweditor/ApplicationUIControllerImpl.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/OutlawEditor/src/main/java/org/badvision/outlaweditor/ApplicationUIControllerImpl.java b/OutlawEditor/src/main/java/org/badvision/outlaweditor/ApplicationUIControllerImpl.java
index 5412b0ba..24447ff9 100644
--- a/OutlawEditor/src/main/java/org/badvision/outlaweditor/ApplicationUIControllerImpl.java
+++ b/OutlawEditor/src/main/java/org/badvision/outlaweditor/ApplicationUIControllerImpl.java
@@ -284,14 +284,12 @@ public class ApplicationUIControllerImpl extends ApplicationUIController {
             TileUtils.redrawTile(t);
         }
         Tile tile = currentTile;
-        Image image = currentImage;
         rebuildTileSelectors();
         setCurrentTile(tile);
         if (currentMapEditor != null) {
             currentMapEditor.redraw();
         }
         rebuildImageSelector();
-        setCurrentImage(image);
     }
     
     @Override
@@ -710,6 +708,7 @@ public class ApplicationUIControllerImpl extends ApplicationUIController {
         if (currentImage != null && currentImage.equals(i)) {
             return;
         }
+        imageSelector.getSelectionModel().select(i);
         currentImage = i;
         if (currentImageEditor != null) {
             currentImageEditor.unregister();
@@ -754,9 +753,10 @@ public class ApplicationUIControllerImpl extends ApplicationUIController {
     }
 
     private void rebuildImageSelector() {
+        Image i = getCurrentImage();
         imageSelector.getItems().clear();
         imageSelector.getItems().addAll(Application.gameData.getImage());
-        imageSelector.getSelectionModel().select(getCurrentImage());
+        imageSelector.getSelectionModel().select(i);
     }
 
     public static enum TABS{image,map,tile};