From 1af7191740a330c03caf9fc266ba8830bdc0cc99 Mon Sep 17 00:00:00 2001 From: Bao Trinh Date: Thu, 21 Apr 2022 21:48:40 -0500 Subject: [PATCH] Backlight: avoid crash on getting brightness fails Reading brightness value for backlight device can fail intermittently (particularly when using ddcci-driver-linux). Handle this more gracefully rather than crashing --- src/modules/backlight.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/modules/backlight.cpp b/src/modules/backlight.cpp index a93934b4..d982ee6b 100644 --- a/src/modules/backlight.cpp +++ b/src/modules/backlight.cpp @@ -214,12 +214,10 @@ void waybar::modules::Backlight::upsert_device(ForwardIt first, ForwardIt last, strncmp(name, "amdgpu_bl", 9) == 0 ? "brightness" : "actual_brightness"; const char *actual = udev_device_get_sysattr_value(dev, actual_brightness_attr); - check_nn(actual); - const int actual_int = std::stoi(actual); + const int actual_int = actual == nullptr ? 0 : std::stoi(actual); const char *max = udev_device_get_sysattr_value(dev, "max_brightness"); - check_nn(max); - const int max_int = std::stoi(max); + const int max_int = max == nullptr ? 0 : std::stoi(max); auto found = std::find_if(first, last, [name](const auto &device) { return device.name() == name; });