aboutsummaryrefslogtreecommitdiffhomepage
path: root/AT91SAM7S256/Source/c_ui.c
diff options
context:
space:
mode:
authorNicolas Schodet2012-02-08 00:00:18 +0100
committerNicolas Schodet2012-02-08 00:00:32 +0100
commitcdcfdfc054aed8f5158bf12d9c4450b3c1ee8ae1 (patch)
tree8dd17090cbf30771e48eaae531c054ec3d693854 /AT91SAM7S256/Source/c_ui.c
parentc331530002825a86f12151266a9772167a3a49ce (diff)
fix some merge mistakes
Diffstat (limited to 'AT91SAM7S256/Source/c_ui.c')
-rw-r--r--AT91SAM7S256/Source/c_ui.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/AT91SAM7S256/Source/c_ui.c b/AT91SAM7S256/Source/c_ui.c
index a9986f1..ac6b499 100644
--- a/AT91SAM7S256/Source/c_ui.c
+++ b/AT91SAM7S256/Source/c_ui.c
@@ -1329,7 +1329,7 @@ void cUiCtrl(void)
pMapDisplay->EraseMask = SCREEN_BIT(SCREEN_BACKGROUND);
#ifndef STRIPPED
- pMapDisplay->pBitmaps[BITMAP_1] = (BMPMAP*)Intro[VarsUi.Pointer];
+ pMapDisplay->pBitmaps[BITMAP_1] = CONFIG_INTRO ? (BMPMAP*)Intro[VarsUi.Pointer] : RCXintro_16;
#endif
pMapDisplay->UpdateMask = BITMAP_BIT(BITMAP_1);
pMapDisplay->Flags |= DISPLAY_ON;
@@ -1442,6 +1442,7 @@ void cUiCtrl(void)
}
break;
#endif /* CONFIG_INTRO */
+
#ifndef STRIPPED
case INIT_WAIT :
{