mirror of
https://github.com/isledecomp/isle-portable.git
synced 2026-02-03 12:31:15 +00:00
isleapp: Only load icon from IOStream if it's valid
This commit is contained in:
parent
7f7d872cb8
commit
c548f2b570
@ -488,19 +488,21 @@ MxResult IsleApp::SetupWindow()
|
|||||||
return FAILURE;
|
return FAILURE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SDL_IOStream* icon_stream = SDL_IOFromMem(isle_bmp, isle_bmp_len);
|
||||||
|
|
||||||
SDL_IOStream *icon_stream = SDL_IOFromMem(isle_bmp, isle_bmp_len);
|
if (icon_stream) {
|
||||||
if (!icon_stream) {
|
SDL_Surface* icon = SDL_LoadBMP_IO(icon_stream, true);
|
||||||
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to open SDL_IOStream for icon: %s", SDL_GetError());
|
|
||||||
|
if (icon) {
|
||||||
|
SDL_SetWindowIcon(m_windowHandle, icon);
|
||||||
|
SDL_DestroySurface(icon);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to load icon: %s", SDL_GetError());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
SDL_Surface *icon = SDL_LoadBMP_IO(icon_stream, true);
|
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to open SDL_IOStream for icon: %s", SDL_GetError());
|
||||||
|
|
||||||
if (icon) {
|
|
||||||
SDL_SetWindowIcon(m_windowHandle, icon);
|
|
||||||
SDL_DestroySurface(icon);
|
|
||||||
} else {
|
|
||||||
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Failed to load icon: %s", SDL_GetError());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!SetupLegoOmni()) {
|
if (!SetupLegoOmni()) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user