diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-07-22 06:05:53 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-07-22 06:05:53 +0000 |
commit | f7675a244b0d1d52bfdf5a1ee0051b46e73f9f2e (patch) | |
tree | a24862b74e4a16e971349a4f4b2975b93e45d5b4 /apps/menus/main_menu.c | |
parent | 9d756e2760a0926aa416b22e276c4a5b2685e84e (diff) | |
download | rockbox-f7675a244b0d1d52bfdf5a1ee0051b46e73f9f2e.tar.gz rockbox-f7675a244b0d1d52bfdf5a1ee0051b46e73f9f2e.zip |
remove the need for action_signalscreenchange().
Fixes problems with targets where the ACTION_STD_CANCEL event is a combo
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13956 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus/main_menu.c')
-rw-r--r-- | apps/menus/main_menu.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index 061c5c215e..7891a5c8a8 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c | |||
@@ -119,10 +119,8 @@ static bool show_credits(void) | |||
119 | if (plugin_load(PLUGIN_DIR "/credits.rock",NULL) != PLUGIN_OK) | 119 | if (plugin_load(PLUGIN_DIR "/credits.rock",NULL) != PLUGIN_OK) |
120 | { | 120 | { |
121 | /* show the rockbox logo and version untill a button is pressed */ | 121 | /* show the rockbox logo and version untill a button is pressed */ |
122 | action_signalscreenchange(); | ||
123 | show_logo(); | 122 | show_logo(); |
124 | get_action(CONTEXT_STD, TIMEOUT_BLOCK); | 123 | get_action(CONTEXT_STD, TIMEOUT_BLOCK); |
125 | action_signalscreenchange(); | ||
126 | } | 124 | } |
127 | return false; | 125 | return false; |
128 | } | 126 | } |
@@ -178,7 +176,7 @@ static bool show_info(void) | |||
178 | #endif | 176 | #endif |
179 | 177 | ||
180 | if (talk_menus_enabled()) | 178 | if (talk_menus_enabled()) |
181 | { | 179 | { |
182 | /* say whatever is reasonable, no real connection to the screen */ | 180 | /* say whatever is reasonable, no real connection to the screen */ |
183 | bool enqueue = false; /* enqueue all but the first */ | 181 | bool enqueue = false; /* enqueue all but the first */ |
184 | if (battery_level() >= 0) | 182 | if (battery_level() >= 0) |
@@ -359,7 +357,6 @@ static bool show_info(void) | |||
359 | break; | 357 | break; |
360 | } | 358 | } |
361 | } | 359 | } |
362 | action_signalscreenchange(); | ||
363 | return false; | 360 | return false; |
364 | } | 361 | } |
365 | MENUITEM_FUNCTION(show_info_item, 0, ID2P(LANG_INFO_MENU), | 362 | MENUITEM_FUNCTION(show_info_item, 0, ID2P(LANG_INFO_MENU), |