bug: fix null pointer in wakeDisplay (#907)

This commit is contained in:
Adam Shiervani 2025-10-28 18:48:30 +01:00 committed by GitHub
parent 204909b49a
commit 50fc88aae1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions

View File

@ -305,11 +305,11 @@ func wakeDisplay(force bool, reason string) {
displayLogger.Warn().Err(err).Msg("failed to wake display")
}
if config.DisplayDimAfterSec != 0 {
if config.DisplayDimAfterSec != 0 && dimTicker != nil {
dimTicker.Reset(time.Duration(config.DisplayDimAfterSec) * time.Second)
}
if config.DisplayOffAfterSec != 0 {
if config.DisplayOffAfterSec != 0 && offTicker != nil {
offTicker.Reset(time.Duration(config.DisplayOffAfterSec) * time.Second)
}
backlightState = 0

View File

@ -46,10 +46,10 @@ export default function SettingsHardwareRoute() {
}
setBacklightSettings(settings);
handleBacklightSettingsSave();
handleBacklightSettingsSave(settings);
};
const handleBacklightSettingsSave = () => {
const handleBacklightSettingsSave = (backlightSettings: BacklightSettings) => {
send("setBacklightSettings", { params: backlightSettings }, (resp: JsonRpcResponse) => {
if ("error" in resp) {
notifications.error(
@ -81,7 +81,7 @@ export default function SettingsHardwareRoute() {
const duration = enabled ? 90 : -1;
send("setVideoSleepMode", { duration }, (resp: JsonRpcResponse) => {
if ("error" in resp) {
notifications.error(m.hardware_power_saving_failed_error({ error: resp.error.data ||m.unknown_error() }));
notifications.error(m.hardware_power_saving_failed_error({ error: resp.error.data || m.unknown_error() }));
setPowerSavingEnabled(!enabled); // Attempt to revert on error
return;
}