Merge branch 'fix/fallback-from-disabled-manual-time-source' into 'master'

Fall back to manual schedule when the manual time source is unavailable

Closes #20

See merge request rmnvgr/nightthemeswitcher-gnome-shell-extension!40
This commit is contained in:
Romain
2020-08-03 20:22:07 +00:00
+11 -2
View File
@@ -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;