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

Correct reusing buffers if the backdrop file is already loaded.

Browse source 
FS#11305 by myself.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26510 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Teruaki Kawashima 2010-06-03 13:32:12 +00:00
parent d68710e9fc
commit 6e39dc9e27
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -31,7 +31,7 @@
#if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1)) #if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1))
static struct skin_backdrop { static struct skin_backdrop {
char name[MAX_FILENAME+1]; char name[MAX_PATH];
char *buffer; char *buffer;
enum screen_type screen; enum screen_type screen;
} backdrops[SKINNABLE_SCREENS_COUNT*NB_SCREENS]; } backdrops[SKINNABLE_SCREENS_COUNT*NB_SCREENS];
@ -88,7 +88,7 @@ char* skin_backdrop_load(char* backdrop, char *bmpdir, enum screen_type screen)
for(i=0;i<SKINNABLE_SCREENS_COUNT*NB_SCREENS;i++) for(i=0;i<SKINNABLE_SCREENS_COUNT*NB_SCREENS;i++)
{ {
if (!strcmp(backdrops[i].name, backdrop) && backdrops[i].screen == screen) if (!strcmp(backdrops[i].name, filename) && backdrops[i].screen == screen)
{ {
return backdrops[i].buffer; return backdrops[i].buffer;
} }
@ -105,7 +105,7 @@ char* skin_backdrop_load(char* backdrop, char *bmpdir, enum screen_type screen)
return NULL; return NULL;
loaded = screens[screen].backdrop_load(filename, bdrop->buffer); loaded = screens[screen].backdrop_load(filename, bdrop->buffer);
bdrop->screen = screen; bdrop->screen = screen;
strlcpy(bdrop->name, backdrop, MAX_FILENAME+1); strlcpy(bdrop->name, filename, sizeof(bdrop->name));
return loaded ? bdrop->buffer : NULL; return loaded ? bdrop->buffer : NULL;
} }