From 94b5f21d10adfae395688f0d91a017ac6e156774 Mon Sep 17 00:00:00 2001
From: Andrew Chin <achin@eminence32.net>
Date: Sat, 7 Apr 2012 16:15:01 -0400
Subject: [PATCH] Have the world selector control have a correct default

---
 overviewer_core/data/js_src/util.js  | 9 +++++----
 overviewer_core/data/js_src/views.js | 3 +++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/overviewer_core/data/js_src/util.js b/overviewer_core/data/js_src/util.js
index fff2d77..350f7f4 100644
--- a/overviewer_core/data/js_src/util.js
+++ b/overviewer_core/data/js_src/util.js
@@ -117,10 +117,6 @@ overviewer.util = {
 
         });
 
-        var worldSelector = new overviewer.views.WorldSelectorView({tagName:'DIV'});
-        overviewer.collections.worlds.bind("add", worldSelector.render, worldSelector);
-
-        
 
         // hook up some events
 
@@ -131,6 +127,11 @@ overviewer.util = {
         // Jump to the hash if given
         overviewer.util.initHash();
 
+        // create this control after initHash so it can correctly select the current world
+        var worldSelector = new overviewer.views.WorldSelectorView({tagName:'DIV'});
+        overviewer.collections.worlds.bind("add", worldSelector.render, worldSelector);
+
+        
         overviewer.util.initializeMarkers();
 
         /*
diff --git a/overviewer_core/data/js_src/views.js b/overviewer_core/data/js_src/views.js
index 46d5379..7ecb169 100644
--- a/overviewer_core/data/js_src/views.js
+++ b/overviewer_core/data/js_src/views.js
@@ -54,6 +54,9 @@ overviewer.views.WorldSelectorView = Backbone.View.extend({
                 var o = document.createElement("option");
                 o.value = elem.model.get("name");
                 o.innerHTML = elem.model.get("name");
+                if (elem.model == overviewer.mapModel.get("currentWorldView").model) {
+                    o.selected=true;
+                }
                 $(o).data("viewObj", elem);
                 selectBox.appendChild(o);