Android/scrcpy
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Continue on icon loading failure

Browse source 
If loading the icon from xpm fails, launch scrcpy without window icon.

<https://github.com/Genymobile/scrcpy/issues/539>
This commit is contained in:
Romain Vimont 2019-05-23 20:58:08 +02:00
parent 2dc1a59471
commit 3133d5d1c7
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/screen.c
View file

@ -177,13 +177,12 @@ screen_init_rendering(struct screen *screen, const char *device_name,
} }
SDL_Surface *icon = read_xpm(icon_xpm); SDL_Surface *icon = read_xpm(icon_xpm);
if (!icon) { if (icon) {
LOGE("Could not load icon: %s", SDL_GetError()); SDL_SetWindowIcon(screen->window, icon);
screen_destroy(screen); SDL_FreeSurface(icon);
return false; } else {
LOGW("Could not load icon");
} }
SDL_SetWindowIcon(screen->window, icon);
SDL_FreeSurface(icon);
LOGI("Initial texture: %" PRIu16 "x%" PRIu16, frame_size.width, LOGI("Initial texture: %" PRIu16 "x%" PRIu16, frame_size.width,
frame_size.height); frame_size.height);