* fixed #10

4 files changed, 6 insertions, 0 deletions

diff --git a/enyo b/enyo
-Subproject 4992cf7de678e059bfc9aabd74d792316b95a9d
+Subproject 4b6496d5f078401a4240b50f3337aeb640d3dac
diff --git a/lib/layout b/lib/layout
-Subproject 7ff26bf0439d5512d2b70c2d0411d5c283bc661
+Subproject 6c94edd0ed5a8566a13dbb0dbbc24f21cb600b0
diff --git a/lib/onyx b/lib/onyx
-Subproject 35e2ccdd2e3eb2e11ac2922ae361d3d655209fd
+Subproject e6107de0937508aa8236b498944269d2f56c679
diff --git a/source/main.js b/source/main.js
index e1b264c..ed28cea 100644
--- a/source/main.js
+++ b/source/main.js
@@ -191,6 +191,7 @@ enyo.kind({
             lastModule = this.settings.lastModule;
         this.$.moduleMenu.destroyClientControls();
         var mods = [];
+        this.currentModule = null;
         this.modules.forEach(enyo.bind(this, function (mod, idx) {
             if ((lastModule && lastModule === mod.modKey)) {
                 this.$.btnModules.setContent(lastModule);
@@ -205,7 +206,12 @@ enyo.kind({
         if(this.currentModule === null) {
             this.currentModule = this.modules[0];
             mods[0]["active"] = true;
+            mods[0]["components"] = [
+                {content: this.currentModule.modKey, index: 0},
+                {kind: "onyx.IconButton", src: "assets/checkmark.png", style: "float: right;"}
+            ];
             this.$.btnModules.setContent(this.currentModule.modKey);
+            this.settings["lastModule"] = this.currentModule.modKey;
         }
         this.$.moduleMenu.createComponents(mods, {owner: this.$.moduleMenu});
         this.$.moduleMenu.render();