From ec9c935c3606f89381f6c4fca8d6102890bd02dc Mon Sep 17 00:00:00 2001
From: akallabeth <akallabeth@posteo.net>
Date: Thu, 3 Apr 2025 12:16:57 +0200
Subject: [PATCH] [client,sdl] unify all gdi_suppress_output calls

---
 client/SDL/SDL3/sdl_disp.cpp    |  4 +++-
 client/SDL/SDL3/sdl_freerdp.cpp | 14 +++-----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/client/SDL/SDL3/sdl_disp.cpp b/client/SDL/SDL3/sdl_disp.cpp
index 235a6c5f3..c30de928f 100644
--- a/client/SDL/SDL3/sdl_disp.cpp
+++ b/client/SDL/SDL3/sdl_disp.cpp
@@ -348,7 +348,9 @@ bool sdlDispContext::handle_window_event(const SDL_WindowEvent* ev)
 		case SDL_EVENT_WINDOW_SHOWN:
 		case SDL_EVENT_WINDOW_MAXIMIZED:
 		case SDL_EVENT_WINDOW_RESTORED:
-			(void)_sdl->redraw();
+			if (!_sdl->redraw())
+				return false;
+
 			/* fallthrough */
 			WINPR_FALLTHROUGH
 		case SDL_EVENT_WINDOW_DISPLAY_SCALE_CHANGED:
diff --git a/client/SDL/SDL3/sdl_freerdp.cpp b/client/SDL/SDL3/sdl_freerdp.cpp
index d16d26b5f..c2319705f 100644
--- a/client/SDL/SDL3/sdl_freerdp.cpp
+++ b/client/SDL/SDL3/sdl_freerdp.cpp
@@ -316,14 +316,6 @@ static BOOL sdl_begin_paint(rdpContext* context)
 	return TRUE;
 }
 
-static BOOL sdl_redraw(SdlContext* sdl)
-{
-	WINPR_ASSERT(sdl);
-
-	auto gdi = sdl->context()->gdi;
-	return gdi_send_suppress_output(gdi, FALSE);
-}
-
 class SdlEventUpdateTriggerGuard
 {
   private:
@@ -938,13 +930,13 @@ static int sdl_run(SdlContext* sdl)
 				break;
 
 				case SDL_EVENT_RENDER_TARGETS_RESET:
-					sdl_redraw(sdl);
+					(void)sdl->redraw();
 					break;
 				case SDL_EVENT_RENDER_DEVICE_RESET:
-					sdl_redraw(sdl);
+					(void)sdl->redraw();
 					break;
 				case SDL_EVENT_WILL_ENTER_FOREGROUND:
-					sdl_redraw(sdl);
+					(void)sdl->redraw();
 					break;
 				case SDL_EVENT_USER_CERT_DIALOG:
 				{