From 69b997c6598ad8fbe54234f29180b0c7cc82a3e4 Mon Sep 17 00:00:00 2001
From: Romain Vigier <romain@romainvigier.fr>
Date: Thu, 3 Dec 2020 11:47:34 +0100
Subject: [PATCH] Activate timer before modules and activate always on-demand
 timer first

---
 src/extension.js            | 2 +-
 src/modules/Backgrounder.js | 1 +
 src/modules/Commander.js    | 4 +++-
 src/modules/CursorThemer.js | 1 +
 src/modules/GtkThemer.js    | 5 ++---
 src/modules/IconThemer.js   | 1 +
 src/modules/ShellThemer.js  | 5 ++---
 src/modules/Timer.js        | 2 +-
 8 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/extension.js b/src/extension.js
index 4b1bdd9..ad6a5bc 100644
--- a/src/extension.js
+++ b/src/extension.js
@@ -78,13 +78,13 @@ function start() {
     commander = new Commander();
 
     settings.enable();
+    timer.enable();
     gtkThemer.enable();
     shellThemer.enable();
     iconThemer.enable();
     cursorThemer.enable();
     backgrounder.enable();
     commander.enable();
-    timer.enable();
 
     enabled = true;
     logDebug('Extension enabled.');
diff --git a/src/modules/Backgrounder.js b/src/modules/Backgrounder.js
index 7828b8f..eb28269 100644
--- a/src/modules/Backgrounder.js
+++ b/src/modules/Backgrounder.js
@@ -44,6 +44,7 @@ var Backgrounder = class {
         if (e.settings.backgrounds.enabled) {
             this._connectSettings();
             this._connectTimer();
+            this._changeSystemBackground(e.timer.time);
         }
         logDebug('Backgrounder enabled.');
     }
diff --git a/src/modules/Commander.js b/src/modules/Commander.js
index 234557e..92f5646 100644
--- a/src/modules/Commander.js
+++ b/src/modules/Commander.js
@@ -37,8 +37,10 @@ var Commander = class {
     enable() {
         logDebug('Enabling Commander...');
         this._watchStatus();
-        if (e.settings.commands.enabled)
+        if (e.settings.commands.enabled) {
             this._connectTimer();
+            this._spawnCommand(e.timer.time);
+        }
         logDebug('Commander enabled.');
     }
 
diff --git a/src/modules/CursorThemer.js b/src/modules/CursorThemer.js
index 6f7b6fe..e065a8a 100644
--- a/src/modules/CursorThemer.js
+++ b/src/modules/CursorThemer.js
@@ -43,6 +43,7 @@ var CursorThemer = class {
         if (e.settings.cursorVariants.enabled) {
             this._connectSettings();
             this._connectTimer();
+            this._setSystemVariant(e.timer.time);
         }
         logDebug('Cursor Themer enabled.');
     }
diff --git a/src/modules/GtkThemer.js b/src/modules/GtkThemer.js
index f9e7c84..9eee3ef 100644
--- a/src/modules/GtkThemer.js
+++ b/src/modules/GtkThemer.js
@@ -57,6 +57,7 @@ var GtkThemer = class {
                 this._connectSettings();
                 this._updateVariants();
                 this._connectTimer();
+                this._setSystemVariant(e.timer.time);
             }
         } catch (error) {
             notifyError(error);
@@ -142,11 +143,9 @@ var GtkThemer = class {
         }
     }
 
-    _onManualChanged(_settings, enabled) {
+    _onManualChanged(_settings, _enabled) {
         this.disable();
         this.enable();
-        if (enabled)
-            this._setSystemVariant(e.timer.time);
     }
 
     _onTimeChanged(_timer, newTime) {
diff --git a/src/modules/IconThemer.js b/src/modules/IconThemer.js
index baf49f6..a92a06a 100644
--- a/src/modules/IconThemer.js
+++ b/src/modules/IconThemer.js
@@ -43,6 +43,7 @@ var IconThemer = class {
         if (e.settings.iconVariants.enabled) {
             this._connectSettings();
             this._connectTimer();
+            this._setSystemVariant(e.timer.time);
         }
         logDebug('Icon Themer enabled.');
     }
diff --git a/src/modules/ShellThemer.js b/src/modules/ShellThemer.js
index d16da4d..ef6f364 100644
--- a/src/modules/ShellThemer.js
+++ b/src/modules/ShellThemer.js
@@ -57,6 +57,7 @@ var ShellThemer = class {
                 this._connectSettings();
                 this._updateVariants();
                 this._connectTimer();
+                this._setSystemVariant(e.timer.time);
             }
         } catch (error) {
             notifyError(error);
@@ -142,11 +143,9 @@ var ShellThemer = class {
         }
     }
 
-    _onManualChanged(_settings, enabled) {
+    _onManualChanged(_settings, _enabled) {
         this.disable();
         this.enable();
-        if (enabled)
-            this._setSystemVariant(e.timer.time);
     }
 
     _onTimeChanged(_timer, newTime) {
diff --git a/src/modules/Timer.js b/src/modules/Timer.js
index 5eeb65d..01633e0 100644
--- a/src/modules/Timer.js
+++ b/src/modules/Timer.js
@@ -125,7 +125,7 @@ var Timer = class {
         }
 
         if (e.settings.time.alwaysEnableOndemand && ['nightlight', 'location', 'schedule'].includes(source))
-            this._sources.push(new TimerOndemand());
+            this._sources.unshift(new TimerOndemand());
     }
 
     _enableSources() {