diff options
author | Mihail Zenkov <mihail.zenkov@gmail.com> | 2016-03-30 22:25:24 +0000 |
---|---|---|
committer | Gerrit Rockbox <gerrit@rockbox.org> | 2016-04-04 11:05:43 +0200 |
commit | 6228c8da185066e3e8824bffc47ed2d11147e84b (patch) | |
tree | 63e4483f562b09a494432056e886fd088d4ee5ac /apps | |
parent | 134e5914a1b530a9b4c5129f5b1eac1393eadcc7 (diff) | |
download | rockbox-6228c8da185066e3e8824bffc47ed2d11147e84b.tar.gz rockbox-6228c8da185066e3e8824bffc47ed2d11147e84b.zip |
Fix reset runtime
Change-Id: Ic1ba0c7c7883aae43100c67235dbc2db83056fe7
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/usb_screen.c | 3 | ||||
-rw-r--r-- | apps/misc.c | 3 | ||||
-rw-r--r-- | apps/settings.c | 5 | ||||
-rw-r--r-- | apps/settings.h | 1 |
4 files changed, 8 insertions, 4 deletions
diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c index 20af4dc3da..1b6f9c3b2a 100644 --- a/apps/gui/usb_screen.c +++ b/apps/gui/usb_screen.c | |||
@@ -96,8 +96,7 @@ static int handle_usb_events(void) | |||
96 | case SYS_USB_DISCONNECTED: | 96 | case SYS_USB_DISCONNECTED: |
97 | return 1; | 97 | return 1; |
98 | case SYS_CHARGER_DISCONNECTED: | 98 | case SYS_CHARGER_DISCONNECTED: |
99 | /*reset rockbox battery runtime*/ | 99 | reset_runtime(); |
100 | global_status.runtime = 0; | ||
101 | break; | 100 | break; |
102 | case SYS_TIMEOUT: | 101 | case SYS_TIMEOUT: |
103 | break; | 102 | break; |
diff --git a/apps/misc.c b/apps/misc.c index b6eaafb599..037daf0cac 100644 --- a/apps/misc.c +++ b/apps/misc.c | |||
@@ -576,8 +576,7 @@ long default_event_handler_ex(long event, void (*callback)(void *), void *parame | |||
576 | 576 | ||
577 | case SYS_CHARGER_DISCONNECTED: | 577 | case SYS_CHARGER_DISCONNECTED: |
578 | car_adapter_mode_processing(false); | 578 | car_adapter_mode_processing(false); |
579 | /*reset rockbox battery runtime*/ | 579 | reset_runtime(); |
580 | global_status.runtime = 0; | ||
581 | return SYS_CHARGER_DISCONNECTED; | 580 | return SYS_CHARGER_DISCONNECTED; |
582 | 581 | ||
583 | case SYS_CAR_ADAPTER_RESUME: | 582 | case SYS_CAR_ADAPTER_RESUME: |
diff --git a/apps/settings.c b/apps/settings.c index a0e20839ed..eed2b3a692 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -608,6 +608,11 @@ static void flush_config_block_callback(void) | |||
608 | settings_write_config(CONFIGFILE, SETTINGS_SAVE_CHANGED); | 608 | settings_write_config(CONFIGFILE, SETTINGS_SAVE_CHANGED); |
609 | } | 609 | } |
610 | 610 | ||
611 | void reset_runtime(void) { | ||
612 | lasttime = current_tick; | ||
613 | global_status.runtime = 0; | ||
614 | } | ||
615 | |||
611 | /* | 616 | /* |
612 | * persist all runtime user settings to disk or RTC RAM | 617 | * persist all runtime user settings to disk or RTC RAM |
613 | */ | 618 | */ |
diff --git a/apps/settings.h b/apps/settings.h index ec2d1007eb..e7388b4586 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -196,6 +196,7 @@ bool settings_load_config(const char* file, bool apply); | |||
196 | 196 | ||
197 | void status_save(void); | 197 | void status_save(void); |
198 | int settings_save(void); | 198 | int settings_save(void); |
199 | void reset_runtime(void); | ||
199 | /* defines for the options paramater */ | 200 | /* defines for the options paramater */ |
200 | enum { | 201 | enum { |
201 | SETTINGS_SAVE_CHANGED = 0, | 202 | SETTINGS_SAVE_CHANGED = 0, |