diff options
author | Thomas Martitz <kugel@rockbox.org> | 2011-02-28 03:24:48 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2011-02-28 03:24:48 +0000 |
commit | d8f6c75ab94ee97e9a49ce669d74dc252225586a (patch) | |
tree | f2eee157a098402ed5ae05866505bfa0e0a20d2b /firmware/target/hosted/sdl/button-sdl.c | |
parent | d69d406e096d9df587e9b263cc16553d17b63162 (diff) | |
download | rockbox-d8f6c75ab94ee97e9a49ce669d74dc252225586a.tar.gz rockbox-d8f6c75ab94ee97e9a49ce669d74dc252225586a.zip |
Hopefully get shutdown/exit handling on SDL/maemo right.
Make shutdown_hw() not return as it's supposed to, ensure sim_do_exit() is called from main thread and move sim_kernel_shutdown() into it to simplify things.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29455 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/hosted/sdl/button-sdl.c')
-rw-r--r-- | firmware/target/hosted/sdl/button-sdl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/firmware/target/hosted/sdl/button-sdl.c b/firmware/target/hosted/sdl/button-sdl.c index 00afc0c8ef..f14e53fb44 100644 --- a/firmware/target/hosted/sdl/button-sdl.c +++ b/firmware/target/hosted/sdl/button-sdl.c | |||
@@ -275,8 +275,8 @@ static bool event_handler(SDL_Event *event) | |||
275 | break; | 275 | break; |
276 | } | 276 | } |
277 | case SDL_QUIT: | 277 | case SDL_QUIT: |
278 | /* Post SYS_POWEROFF event. Will post SDL_USEREVENT in shutdown_hw() if successful. */ | 278 | /* Will post SDL_USEREVENT in shutdown_hw() if successful. */ |
279 | queue_broadcast(SYS_POWEROFF, 0); | 279 | sys_poweroff(); |
280 | break; | 280 | break; |
281 | case SDL_USEREVENT: | 281 | case SDL_USEREVENT: |
282 | return true; | 282 | return true; |
@@ -324,8 +324,8 @@ static void button_event(int key, bool pressed) | |||
324 | 324 | ||
325 | #if (CONFIG_PLATFORM & PLATFORM_PANDORA) | 325 | #if (CONFIG_PLATFORM & PLATFORM_PANDORA) |
326 | case SDLK_LCTRL: | 326 | case SDLK_LCTRL: |
327 | /* Post SYS_POWEROFF event. Will post SDL_USEREVENT in shutdown_hw() if successful. */ | 327 | /* Will post SDL_USEREVENT in shutdown_hw() if successful. */ |
328 | queue_broadcast(SYS_POWEROFF, 0); | 328 | sys_poweroff(); |
329 | break; | 329 | break; |
330 | #endif | 330 | #endif |
331 | #ifdef HAS_BUTTON_HOLD | 331 | #ifdef HAS_BUTTON_HOLD |