From 5c4fff7f639c1299172ecc755227de38ff0e3431 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Fri, 4 Feb 2022 14:02:44 -0800
Subject: [PATCH] Don't fail to get battery status if the upower refresh call
fails
---
src/power/linux/SDL_syspower.c | 34 +++++++++++++++++++++-------------
1 file changed, 21 insertions(+), 13 deletions(-)
diff --git a/src/power/linux/SDL_syspower.c b/src/power/linux/SDL_syspower.c
index 1f238c52410..f4e1ecc3da2 100644
--- a/src/power/linux/SDL_syspower.c
+++ b/src/power/linux/SDL_syspower.c
@@ -561,22 +561,30 @@ check_upower_device(DBusConnection *conn, const char *path, SDL_PowerState *stat
return;
} else if (!ui32) {
return; /* we don't care about random devices with batteries, like wireless controllers, etc */
- } else if (!SDL_DBus_QueryPropertyOnConnection(conn, UPOWER_DBUS_NODE, path, UPOWER_DEVICE_DBUS_INTERFACE, "IsPresent", DBUS_TYPE_BOOLEAN, &ui32)) {
+ }
+
+ if (!SDL_DBus_QueryPropertyOnConnection(conn, UPOWER_DBUS_NODE, path, UPOWER_DEVICE_DBUS_INTERFACE, "IsPresent", DBUS_TYPE_BOOLEAN, &ui32)) {
return;
- } else if (!ui32) {
+ }
+ if (!ui32) {
st = SDL_POWERSTATE_NO_BATTERY;
- } else if (!SDL_DBus_CallMethodOnConnection(conn, UPOWER_DBUS_NODE, path, UPOWER_DEVICE_DBUS_INTERFACE, "Refresh", DBUS_TYPE_INVALID, DBUS_TYPE_INVALID)) {
- return;
- } else if (!SDL_DBus_QueryPropertyOnConnection(conn, UPOWER_DBUS_NODE, path, UPOWER_DEVICE_DBUS_INTERFACE, "State", DBUS_TYPE_UINT32, &ui32)) {
- st = SDL_POWERSTATE_UNKNOWN; /* uh oh */
- } else if (ui32 == 1) { /* 1 == charging */
- st = SDL_POWERSTATE_CHARGING;
- } else if ((ui32 == 2) || (ui32 == 3)) { /* 2 == discharging, 3 == empty. */
- st = SDL_POWERSTATE_ON_BATTERY;
- } else if (ui32 == 4) { /* 4 == full */
- st = SDL_POWERSTATE_CHARGED;
} else {
- st = SDL_POWERSTATE_UNKNOWN; /* uh oh */
+ /* Get updated information on the battery status
+ * This can occasionally fail, and we'll just return slightly stale data in that case
+ */
+ SDL_DBus_CallMethodOnConnection(conn, UPOWER_DBUS_NODE, path, UPOWER_DEVICE_DBUS_INTERFACE, "Refresh", DBUS_TYPE_INVALID, DBUS_TYPE_INVALID);
+
+ if (!SDL_DBus_QueryPropertyOnConnection(conn, UPOWER_DBUS_NODE, path, UPOWER_DEVICE_DBUS_INTERFACE, "State", DBUS_TYPE_UINT32, &ui32)) {
+ st = SDL_POWERSTATE_UNKNOWN; /* uh oh */
+ } else if (ui32 == 1) { /* 1 == charging */
+ st = SDL_POWERSTATE_CHARGING;
+ } else if ((ui32 == 2) || (ui32 == 3)) { /* 2 == discharging, 3 == empty. */
+ st = SDL_POWERSTATE_ON_BATTERY;
+ } else if (ui32 == 4) { /* 4 == full */
+ st = SDL_POWERSTATE_CHARGED;
+ } else {
+ st = SDL_POWERSTATE_UNKNOWN; /* uh oh */
+ }
}
if (!SDL_DBus_QueryPropertyOnConnection(conn, UPOWER_DBUS_NODE, path, UPOWER_DEVICE_DBUS_INTERFACE, "Percentage", DBUS_TYPE_DOUBLE, &d)) {