Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Hopefully fix FS#11630 where the wps backdrop would be shown instead of the menu one

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28116 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2010-09-19 11:49:33 +00:00
parent 272e425a2f
commit 2c8204cd91
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
apps/gui/skin_engine/skin_backdrops.c
View file

@ -63,12 +63,6 @@ int skin_backdrop_assign(char* backdrop, char *bmpdir,
filename[1] = '\0';
filename[2] = '\0'; /* we check this later to see if we actually have an
image to load. != '\0' means display the image */
#if NB_SCREENS > 1
if (screen == SCREEN_REMOTE)
{
filename[0] = '\0';
}
#endif
}
else
{
@ -150,8 +144,8 @@ void skin_backdrop_show(int backdrop_id)
enum screen_type screen = backdrops[backdrop_id].screen;
if (backdrops[backdrop_id].name[0] == '-' &&
backdrops[backdrop_id].name[2] == '\0')
return;
if (backdrops[backdrop_id].buffer)
screens[screen].backdrop_show(NULL);
else if (backdrops[backdrop_id].buffer)
screens[screen].backdrop_show(backdrops[backdrop_id].buffer);
}
@ -185,6 +179,13 @@ void skin_backdrop_load_setting(void)
else
backdrops[i].name[2] = '\0';
}
#if NB_SCREENS > 1
else if (backdrops[i].name[0] == '-')
{
backdrops[i].name[2] = '\0';
return;
}
#endif
}
}