From 8f819a2fde6fcdd5cf0c1c52384863763783c668 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Mon, 23 Oct 2023 00:31:30 +0300 Subject: [PATCH] engine: platform: sdl: fix forgotten icon setup call --- engine/platform/sdl/vid_sdl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/engine/platform/sdl/vid_sdl.c b/engine/platform/sdl/vid_sdl.c index 224dcefa..6dd112ef 100644 --- a/engine/platform/sdl/vid_sdl.c +++ b/engine/platform/sdl/vid_sdl.c @@ -645,9 +645,9 @@ void VID_RestoreScreenResolution( void ) #endif // SDL_VERSION_ATLEAST( 2, 0, 0 ) } +#if SDL_VERSION_ATLEAST( 2, 0, 0 ) static void VID_SetWindowIcon( SDL_Window *hWnd ) { -#if SDL_VERSION_ATLEAST( 2, 0, 0 ) rgbdata_t *icon = NULL; char iconpath[MAX_STRING]; const char *localIcoPath; @@ -685,8 +685,8 @@ static void VID_SetWindowIcon( SDL_Window *hWnd ) #if XASH_WIN32 // ICO support only for Win32 WIN_SetWindowIcon( LoadIcon( host.hInst, MAKEINTRESOURCE( 101 ))); #endif -#endif // SDL_VERSION_ATLEAST( 2, 0, 0 ) } +#endif // SDL_VERSION_ATLEAST( 2, 0, 0 ) static qboolean VID_CreateWindowWithSafeGL( const char *wndname, int xpos, int ypos, int w, int h, uint32_t flags ) { @@ -804,6 +804,7 @@ qboolean VID_CreateWindow( int width, int height, window_mode_t window_mode ) else VID_RestoreScreenResolution(); #endif + VID_SetWindowIcon( host.hWnd ); SDL_ShowWindow( host.hWnd ); if( glw_state.software )