diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2009-01-08 12:32:35 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2009-01-08 12:32:35 +0000 |
commit | 23825fdb4365ae3ef0ea71fbfbb99cbba5317b39 (patch) | |
tree | 16945ac2e1718e531bc44bf384c9f3ada3301f14 | |
parent | faa01e9e94e0bdd0271eead17c69efb63b1189dd (diff) | |
download | rockbox-23825fdb4365ae3ef0ea71fbfbb99cbba5317b39.tar.gz rockbox-23825fdb4365ae3ef0ea71fbfbb99cbba5317b39.zip |
revert r19638 which was just bad...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19720 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/plugins/credits.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/apps/plugins/credits.c b/apps/plugins/credits.c index 9a3a01e596..62471c5bc7 100644 --- a/apps/plugins/credits.c +++ b/apps/plugins/credits.c | |||
@@ -373,7 +373,6 @@ static void roll_credits(void) | |||
373 | 373 | ||
374 | enum plugin_status plugin_start(const struct plugin_api* api, const void* parameter) | 374 | enum plugin_status plugin_start(const struct plugin_api* api, const void* parameter) |
375 | { | 375 | { |
376 | long finish; | ||
377 | (void)parameter; | 376 | (void)parameter; |
378 | rb = api; | 377 | rb = api; |
379 | 378 | ||
@@ -386,11 +385,8 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame | |||
386 | #endif | 385 | #endif |
387 | 386 | ||
388 | /* Show the logo for about 3 secs allowing the user to stop */ | 387 | /* Show the logo for about 3 secs allowing the user to stop */ |
389 | finish = *rb->current_tick + 3*HZ; | 388 | if(!rb->action_userabort(3*HZ)) |
390 | while (*rb->current_tick < finish) | 389 | roll_credits(); |
391 | if(rb->action_userabort(finish - *rb->current_tick)) | ||
392 | break; | ||
393 | roll_credits(); | ||
394 | 390 | ||
395 | /* Turn on backlight timeout (revert to settings) */ | 391 | /* Turn on backlight timeout (revert to settings) */ |
396 | backlight_use_settings(rb); /* backlight control in lib/helper.c */ | 392 | backlight_use_settings(rb); /* backlight control in lib/helper.c */ |