From 9c0894d4a039ff01861dbe38c70f46fea28cfb1b Mon Sep 17 00:00:00 2001
From: Romain Vigier <romain@romainvigier.fr>
Date: Wed, 5 Aug 2020 12:08:14 +0200
Subject: [PATCH] Set current variant when manual GTK variants are enabled

---
 src/modules/GtkThemer.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/modules/GtkThemer.js b/src/modules/GtkThemer.js
index 0490895..c0200b2 100644
--- a/src/modules/GtkThemer.js
+++ b/src/modules/GtkThemer.js
@@ -46,6 +46,7 @@ var GtkThemer = class {
         this._gtkVariantsStatusChangedConnect = null;
         this._gtkVariantChangedConnect = null;
         this._gtkThemeChangedConnect = null;
+        this._manualGtkVariantsChangedConnect = null;
         this._timeChangedConnect = null;
     }
 
@@ -55,8 +56,8 @@ var GtkThemer = class {
             this._watchStatus();
             this._saveOriginalTheme();
             if (e.settingsManager.gtkVariantsEnabled) {
-                this._updateVariants();
                 this._connectSettings();
+                this._updateVariants();
                 this._connectTimer();
             }
         } catch (error) {
@@ -92,6 +93,7 @@ var GtkThemer = class {
         logDebug('Connecting GTK Themer to settings...');
         this._gtkVariantChangedConnect = e.settingsManager.connect('gtk-variant-changed', this._onGtkVariantChanged.bind(this));
         this._gtkThemeChangedConnect = e.settingsManager.connect('gtk-theme-changed', this._onGtkThemeChanged.bind(this));
+        this._manualGtkVariantsChangedConnect = e.settingsManager.connect('manual-gtk-variants-changed', this._onManualGtkVariantsChanged.bind(this));
     }
 
     _disconnectSettings() {
@@ -139,6 +141,13 @@ var GtkThemer = class {
         }
     }
 
+    _onManualGtkVariantsChanged(_settings, enabled) {
+        this.disable();
+        this.enable();
+        if (enabled && e.timer.time)
+            this._setVariant(e.timer.time);
+    }
+
     _onTimeChanged(_timer, newTime) {
         this._setVariant(newTime);
     }