diff --git a/quickshell/Common/SessionData.qml b/quickshell/Common/SessionData.qml index cdcfa6ca..e8537300 100644 --- a/quickshell/Common/SessionData.qml +++ b/quickshell/Common/SessionData.qml @@ -580,14 +580,7 @@ Singleton { } } - if (!newSettings[identifier]) { - newSettings[identifier] = { - "enabled": false, - "mode": "interval", - "interval": 300, - "time": "06:00" - }; - } + newSettings[identifier] = getMonitorCyclingSettings(screenName); newSettings[identifier].enabled = enabled; monitorCyclingSettings = newSettings; saveSettings(); @@ -618,14 +611,7 @@ Singleton { } } - if (!newSettings[identifier]) { - newSettings[identifier] = { - "enabled": false, - "mode": "interval", - "interval": 300, - "time": "06:00" - }; - } + newSettings[identifier] = getMonitorCyclingSettings(screenName); newSettings[identifier].mode = mode; monitorCyclingSettings = newSettings; saveSettings(); @@ -656,14 +642,7 @@ Singleton { } } - if (!newSettings[identifier]) { - newSettings[identifier] = { - "enabled": false, - "mode": "interval", - "interval": 300, - "time": "06:00" - }; - } + newSettings[identifier] = getMonitorCyclingSettings(screenName); newSettings[identifier].interval = interval; monitorCyclingSettings = newSettings; saveSettings(); @@ -694,14 +673,7 @@ Singleton { } } - if (!newSettings[identifier]) { - newSettings[identifier] = { - "enabled": false, - "mode": "interval", - "interval": 300, - "time": "06:00" - }; - } + newSettings[identifier] = getMonitorCyclingSettings(screenName); newSettings[identifier].time = time; monitorCyclingSettings = newSettings; saveSettings(); @@ -1218,7 +1190,7 @@ Singleton { "time": "06:00" }; var value = _findMonitorValue(monitorCyclingSettings, screenName); - return value !== undefined ? value : defaults; + return Object.assign({}, defaults, value !== undefined ? value : {}); } FileView {