diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/menus/main_menu.c | 10 | ||||
-rw-r--r-- | apps/misc.c | 4 |
2 files changed, 12 insertions, 2 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index e59a9c978f..780d35d321 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c | |||
@@ -27,6 +27,7 @@ | |||
27 | #include "settings.h" | 27 | #include "settings.h" |
28 | #include "powermgmt.h" | 28 | #include "powermgmt.h" |
29 | #include "menu.h" | 29 | #include "menu.h" |
30 | #include "misc.h" | ||
30 | #include "settings_menu.h" | 31 | #include "settings_menu.h" |
31 | #include "exported_menus.h" | 32 | #include "exported_menus.h" |
32 | #include "tree.h" | 33 | #include "tree.h" |
@@ -115,7 +116,14 @@ MAKE_MENU(manage_settings, ID2P(LANG_MANAGE_MENU), NULL, Icon_Config, | |||
115 | 116 | ||
116 | static bool show_credits(void) | 117 | static bool show_credits(void) |
117 | { | 118 | { |
118 | plugin_load(PLUGIN_DIR "/credits.rock",NULL); | 119 | if (plugin_load(PLUGIN_DIR "/credits.rock",NULL) != PLUGIN_OK) |
120 | { | ||
121 | /* show the rockbox logo and version untill a button is pressed */ | ||
122 | action_signalscreenchange(); | ||
123 | show_logo(); | ||
124 | get_action(CONTEXT_STD, TIMEOUT_BLOCK); | ||
125 | action_signalscreenchange(); | ||
126 | } | ||
119 | return false; | 127 | return false; |
120 | } | 128 | } |
121 | 129 | ||
diff --git a/apps/misc.c b/apps/misc.c index 8004589732..f536f5c93f 100644 --- a/apps/misc.c +++ b/apps/misc.c | |||
@@ -880,6 +880,7 @@ int show_logo( void ) | |||
880 | lcd_getstringsize((unsigned char *)"A", &font_w, &font_h); | 880 | lcd_getstringsize((unsigned char *)"A", &font_w, &font_h); |
881 | lcd_putsxy((LCD_WIDTH/2) - ((strlen(version)*font_w)/2), | 881 | lcd_putsxy((LCD_WIDTH/2) - ((strlen(version)*font_w)/2), |
882 | LCD_HEIGHT-font_h, (unsigned char *)version); | 882 | LCD_HEIGHT-font_h, (unsigned char *)version); |
883 | lcd_setfont(FONT_UI); | ||
883 | 884 | ||
884 | #else | 885 | #else |
885 | char *rockbox = " ROCKbox!"; | 886 | char *rockbox = " ROCKbox!"; |
@@ -898,7 +899,8 @@ int show_logo( void ) | |||
898 | lcd_remote_setfont(FONT_SYSFIXED); | 899 | lcd_remote_setfont(FONT_SYSFIXED); |
899 | lcd_remote_getstringsize((unsigned char *)"A", &font_w, &font_h); | 900 | lcd_remote_getstringsize((unsigned char *)"A", &font_w, &font_h); |
900 | lcd_remote_putsxy((LCD_REMOTE_WIDTH/2) - ((strlen(version)*font_w)/2), | 901 | lcd_remote_putsxy((LCD_REMOTE_WIDTH/2) - ((strlen(version)*font_w)/2), |
901 | LCD_REMOTE_HEIGHT-font_h, (unsigned char *)version); | 902 | LCD_REMOTE_HEIGHT-font_h, (unsigned char *)version); |
903 | lcd_setfont(FONT_UI); | ||
902 | lcd_remote_update(); | 904 | lcd_remote_update(); |
903 | #endif | 905 | #endif |
904 | 906 | ||