From 9e18f1f03855ed5578d1c0571098205184564efe Mon Sep 17 00:00:00 2001 From: Romain Vigier Date: Wed, 5 Aug 2020 12:23:04 +0200 Subject: [PATCH] Don't try to set variant if the current time is unavailable --- src/modules/GtkThemer.js | 4 +++- src/modules/ShellThemer.js | 4 +++- src/modules/Timer.js | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/modules/GtkThemer.js b/src/modules/GtkThemer.js index c0200b2..d0e1a09 100644 --- a/src/modules/GtkThemer.js +++ b/src/modules/GtkThemer.js @@ -144,7 +144,7 @@ var GtkThemer = class { _onManualGtkVariantsChanged(_settings, enabled) { this.disable(); this.enable(); - if (enabled && e.timer.time) + if (enabled) this._setVariant(e.timer.time); } @@ -158,6 +158,8 @@ var GtkThemer = class { } _setVariant(time) { + if (!time) + return; logDebug(`Setting the GTK ${time} variant...`); switch (time) { case 'day': diff --git a/src/modules/ShellThemer.js b/src/modules/ShellThemer.js index fd8b049..5d8d992 100644 --- a/src/modules/ShellThemer.js +++ b/src/modules/ShellThemer.js @@ -144,7 +144,7 @@ var ShellThemer = class { _onManualShellVariantsChanged(_settings, enabled) { this.disable(); this.enable(); - if (enabled && e.timer.time) + if (enabled) this._setVariant(e.timer.time); } @@ -158,6 +158,8 @@ var ShellThemer = class { } _setVariant(time) { + if (!time) + return; logDebug(`Setting the shell ${time} variant...`); let shellTheme; switch (time) { diff --git a/src/modules/Timer.js b/src/modules/Timer.js index b79bc61..220f9af 100644 --- a/src/modules/Timer.js +++ b/src/modules/Timer.js @@ -75,7 +75,7 @@ var Timer = class { get time() { - return this._source.time; + return this._source ? this._source.time : null; }