Merge branch 'release/version-19'

BigE · Feb 16, 2017 · 6a76f42 · 6a76f42
2 parents 17f225f + ff00817
commit 6a76f42
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/[email protected]/extension.js b/[email protected]/extension.js
@@ -68,11 +68,6 @@ const DeskChangerIndicator = new Lang.Class({
             Util.spawn(['gnome-shell-extension-prefs', Me.metadata.uuid]);
         });
         this.menu.addMenuItem(settings);
-
-        if (!this.daemon.is_running && this.settings.auto_start) {
-            // start the auto start goodness.
-            this.daemon.toggle();
-        }
     },
 
     destroy: function () {
@@ -181,6 +176,11 @@ function enable() {
     error_id = daemon.connectSignal('error', function (emitter, signalName, parameters) {
         Main.notifyError('Desk Changer', 'Daemon Error: ' + parameters[0]);
     });
+
+    if (!daemon.is_running && settings.auto_start) {
+        // run if auto start is enabled and its not already running
+        daemon.toggle();
+    }
 }
 
 function init() {

diff --git a/[email protected]/metadata.json b/[email protected]/metadata.json
@@ -16,5 +16,5 @@
   ],
   "url": "https://github.com/BigE/desk-changer/",
   "uuid": "[email protected]",
-  "version": "18"
+  "version": "19"
 }
diff --git a/[email protected]/schemas/gschemas.compiled b/[email protected]/schemas/gschemas.compiled