[Pkg-wmaker-commits] [wmbattery] 139/241: wmbattery.c: Move assignment of old_status until after cur_info is initialized.
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Mon Aug 24 23:37:48 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmbattery.
commit 55a06b628eaed9556c64215de42cdc454cc9ed95
Author: Doug Torrance <dtorrance at monmouthcollege.edu>
Date: Sat Sep 6 23:35:06 2014 -0500
wmbattery.c: Move assignment of old_status until after cur_info is initialized.
---
wmbattery.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/wmbattery.c b/wmbattery.c
index 91b98b8..fe219b6 100644
--- a/wmbattery.c
+++ b/wmbattery.c
@@ -528,7 +528,6 @@ void alarmhandler(int sig) {
apm_info cur_info;
int old_status;
- old_status = cur_info.battery_status;
#ifdef UPOWER
if (use_upower) {
if (upower_read(1, &cur_info) != 0)
@@ -555,7 +554,9 @@ void alarmhandler(int sig) {
if (sonypi_read(&cur_info) != 0)
error("Cannot read sonypi information.");
}
-
+
+ old_status = cur_info.battery_status;
+
/* Always calculate remaining lifetime? apm and acpi both use a
* negative number here to indicate error, missing battery, or
* cannot determine time. */
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbattery.git
More information about the Pkg-wmaker-commits
mailing list