From e128c06d2e47ca50adfc8bb5533107059a7470f8 Mon Sep 17 00:00:00 2001 From: natinusala Date: Sun, 12 May 2019 14:38:40 +0200 Subject: [PATCH] platform_linux: more flexible battery display --- frontend/drivers/platform_unix.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/frontend/drivers/platform_unix.c b/frontend/drivers/platform_unix.c index 802dde546c..f2e0e113c7 100644 --- a/frontend/drivers/platform_unix.c +++ b/frontend/drivers/platform_unix.c @@ -1101,10 +1101,14 @@ static bool frontend_unix_powerstate_check_acpi_sysfs( retro_closedir(entry); entry = retro_opendir(proc_acpi_sysfs_ac_adapter_path); - if (!entry) - goto error; - check_proc_acpi_sysfs_ac_adapter(retro_dirent_get_name(entry), &have_ac); + if (entry) + { + check_proc_acpi_sysfs_ac_adapter(retro_dirent_get_name(entry), &have_ac); + retro_closedir(entry); + } + else + have_ac = false; if (!have_battery) { @@ -1117,8 +1121,6 @@ static bool frontend_unix_powerstate_check_acpi_sysfs( else *state = FRONTEND_POWERSTATE_ON_POWER_SOURCE; - retro_closedir(entry); - return true; error: