From c91877fd88349ea31436a8a99bbbe583b0b4f6f4 Mon Sep 17 00:00:00 2001 From: Romain Vigier Date: Mon, 3 Aug 2020 22:16:44 +0200 Subject: [PATCH] Fall back to manual schedule when the manual time source is unavailable --- src/modules/Timer.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/modules/Timer.js b/src/modules/Timer.js index ba3c822..b79bc61 100644 --- a/src/modules/Timer.js +++ b/src/modules/Timer.js @@ -172,8 +172,17 @@ var Timer = class { logDebug('Getting time source...'); if (e.settingsManager.manualTimeSource) { - logDebug(`Time source is forced to ${e.settingsManager.timeSource}.`); - return e.settingsManager.timeSource; + let source = e.settingsManager.timeSource; + logDebug(`Time source is forced to ${source}.`); + if ( + (source === 'nightlight' && !e.settingsManager.nightlightEnabled) || + (source === 'location' && !e.settingsManager.locationEnabled) + ) { + logDebug(`Unable to choose ${source} time source, falling back to manual schedule.`); + source = 'schedule'; + e.settingsManager.timeSource = source; + } + return source; } let source;