summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2007-04-12 12:14:54 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2007-04-12 12:14:54 +0000
commitc9397742691b2920538fe600d1eb8ca154a4d448 (patch)
tree4ae229105442ed934a0ba52e7fb2d0df1c04e231 /apps
parent8b9df97d96f48b06253c662691cb0b19193e2351 (diff)
downloadrockbox-c9397742691b2920538fe600d1eb8ca154a4d448.tar.gz
rockbox-c9397742691b2920538fe600d1eb8ca154a4d448.zip
If credits.rock isnt loadable manually show the logo and version.
Hopefully fixes FS#6799 git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13124 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/menus/main_menu.c10
-rw-r--r--apps/misc.c4
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 @@
#include "settings.h"
#include "powermgmt.h"
#include "menu.h"
+#include "misc.h"
#include "settings_menu.h"
#include "exported_menus.h"
#include "tree.h"
@@ -115,7 +116,14 @@ MAKE_MENU(manage_settings, ID2P(LANG_MANAGE_MENU), NULL, Icon_Config,
static bool show_credits(void)
{
- plugin_load(PLUGIN_DIR "/credits.rock",NULL);
+ if (plugin_load(PLUGIN_DIR "/credits.rock",NULL) != PLUGIN_OK)
+ {
+ /* show the rockbox logo and version untill a button is pressed */
+ action_signalscreenchange();
+ show_logo();
+ get_action(CONTEXT_STD, TIMEOUT_BLOCK);
+ action_signalscreenchange();
+ }
return false;
}
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 )
lcd_getstringsize((unsigned char *)"A", &font_w, &font_h);
lcd_putsxy((LCD_WIDTH/2) - ((strlen(version)*font_w)/2),
LCD_HEIGHT-font_h, (unsigned char *)version);
+ lcd_setfont(FONT_UI);
#else
char *rockbox = " ROCKbox!";
@@ -898,7 +899,8 @@ int show_logo( void )
lcd_remote_setfont(FONT_SYSFIXED);
lcd_remote_getstringsize((unsigned char *)"A", &font_w, &font_h);
lcd_remote_putsxy((LCD_REMOTE_WIDTH/2) - ((strlen(version)*font_w)/2),
- LCD_REMOTE_HEIGHT-font_h, (unsigned char *)version);
+ LCD_REMOTE_HEIGHT-font_h, (unsigned char *)version);
+ lcd_setfont(FONT_UI);
lcd_remote_update();
#endif