From 8042d7e1653217e914e75da4994cc39da2b04e6c Mon Sep 17 00:00:00 2001 From: akallabeth Date: Fri, 22 Aug 2025 12:09:10 +0200 Subject: [PATCH] [client,sdl] always set sdl->windows_created when the window creation function is called always set the event. --- client/SDL/SDL2/sdl_freerdp.cpp | 4 ++-- client/SDL/SDL3/sdl_freerdp.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/client/SDL/SDL2/sdl_freerdp.cpp b/client/SDL/SDL2/sdl_freerdp.cpp index 564406cbd..8c489fe65 100644 --- a/client/SDL/SDL2/sdl_freerdp.cpp +++ b/client/SDL/SDL2/sdl_freerdp.cpp @@ -707,6 +707,8 @@ static BOOL sdl_create_windows(SdlContext* sdl) auto settings = sdl->context()->settings; auto title = sdl_window_get_title(settings); + ScopeGuard guard([&]() { sdl->windows_created.set(); }); + UINT32 windowCount = freerdp_settings_get_uint32(settings, FreeRDP_MonitorCount); for (UINT32 x = 0; x < windowCount; x++) @@ -758,8 +760,6 @@ static BOOL sdl_create_windows(SdlContext* sdl) static_cast(h), flags }; - ScopeGuard guard([&]() { sdl->windows_created.set(); }); - if (!window.window()) return FALSE; diff --git a/client/SDL/SDL3/sdl_freerdp.cpp b/client/SDL/SDL3/sdl_freerdp.cpp index 58dc9dbf9..ad1c17927 100644 --- a/client/SDL/SDL3/sdl_freerdp.cpp +++ b/client/SDL/SDL3/sdl_freerdp.cpp @@ -613,6 +613,8 @@ static BOOL sdl_create_windows(SdlContext* sdl) auto settings = sdl->context()->settings; auto title = sdl_window_get_title(settings); + ScopeGuard guard1([&]() { sdl->windows_created.set(); }); + UINT32 windowCount = freerdp_settings_get_uint32(settings, FreeRDP_MonitorCount); Sint32 originX = 0; @@ -674,7 +676,6 @@ static BOOL sdl_create_windows(SdlContext* sdl) static_cast(w), static_cast(h), flags }; - ScopeGuard guard1([&]() { sdl->windows_created.set(); }); if (!window.window()) return FALSE;