summaryrefslogtreecommitdiff
path: root/firmware/target/hosted
diff options
context:
space:
mode:
authorAndree Buschmann <AndreeBuschmann@t-online.de>2011-10-28 17:23:40 +0000
committerAndree Buschmann <AndreeBuschmann@t-online.de>2011-10-28 17:23:40 +0000
commitb8223d908bb96486f4e49463cc906246f4cdb7cd (patch)
treee59c1f83dcbc739a721b04de44cf6a223fba72d7 /firmware/target/hosted
parente126153687c94f5dd901e085444cc60c394a1591 (diff)
downloadrockbox-b8223d908bb96486f4e49463cc906246f4cdb7cd.tar.gz
rockbox-b8223d908bb96486f4e49463cc906246f4cdb7cd.zip
Fix FS#12351: The poweroff timer was not reset on scroll wheel activity for e200 and simulator. Thanks to Nick Peskett.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30847 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/hosted')
-rw-r--r--firmware/target/hosted/sdl/button-sdl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/firmware/target/hosted/sdl/button-sdl.c b/firmware/target/hosted/sdl/button-sdl.c
index 3d6a3797cf..ca1f2e5eb1 100644
--- a/firmware/target/hosted/sdl/button-sdl.c
+++ b/firmware/target/hosted/sdl/button-sdl.c
@@ -33,6 +33,7 @@
33#include "sim_tasks.h" 33#include "sim_tasks.h"
34#include "buttonmap.h" 34#include "buttonmap.h"
35#include "debug.h" 35#include "debug.h"
36#include "powermgmt.h"
36 37
37#ifdef HAVE_TOUCHSCREEN 38#ifdef HAVE_TOUCHSCREEN
38#include "touchscreen.h" 39#include "touchscreen.h"
@@ -418,6 +419,7 @@ static void button_event(int key, bool pressed)
418#ifdef HAVE_BUTTON_LIGHT 419#ifdef HAVE_BUTTON_LIGHT
419 buttonlight_on(); 420 buttonlight_on();
420#endif 421#endif
422 reset_poweroff_timer();
421 queue_post(&button_queue, new_btn, 1<<24); 423 queue_post(&button_queue, new_btn, 1<<24);
422 new_btn &= ~(BUTTON_SCROLL_FWD | BUTTON_SCROLL_BACK); 424 new_btn &= ~(BUTTON_SCROLL_FWD | BUTTON_SCROLL_BACK);
423 } 425 }