aljaz/scrcpy
1
0
Fork 0
mirror of https://github.com/Genymobile/scrcpy.git synced 2026-02-15 02:44:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

do-not-fail-if-icon-fails

Browse Source
This commit is contained in:
Romain Vimont
2026-01-25 12:28:31 +01:00
parent bddbdbe469
commit 1b41d54917
1 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/src/screen.c
View File

@@ -461,28 +461,25 @@ sc_screen_init(struct sc_screen *screen,
if (!SDL_SetWindowIcon(screen->window, icon)) {
LOGW("Could not set window icon: %s", SDL_GetError());
}
} else if (params->video) {
// just a warning
LOGW("Could not load icon");
} else {
// without video, the icon is used as window content, it must be present
LOGE("Could not load icon");
goto error_destroy_texture;
}
if (!params->video) {
assert(icon);
screen->content_size.width = icon->w;
screen->content_size.height = icon->h;
ok = sc_texture_set_from_surface(&screen->tex, icon);
if (!ok) {
if (!params->video) {
screen->content_size.width = icon->w;
screen->content_size.height = icon->h;
ok = sc_texture_set_from_surface(&screen->tex, icon);
sc_icon_destroy(icon);
goto error_destroy_texture;
if (!ok) {
LOGE("Could not set icon: %s", SDL_GetError());
}
}
}
} else {
// not fatal
LOGE("Could not load icon");
if (icon) {
sc_icon_destroy(icon);
if (!params->video) {
// Make sure the content size is initialized
screen->content_size.width = 256;
screen->content_size.height = 256;
}
}
screen->frame = av_frame_alloc();