From 10d79a81566c919e6cbf04d8a4fe58cca1a7edc0 Mon Sep 17 00:00:00 2001 From: FunkyFr3sh Date: Thu, 8 Aug 2019 03:26:13 +0200 Subject: [PATCH] tweak fake_DestroyWindow --- src/mouse.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/mouse.c b/src/mouse.c index 5e000c2..34c9d22 100644 --- a/src/mouse.c +++ b/src/mouse.c @@ -426,17 +426,20 @@ BOOL WINAPI fake_DestroyWindow(HWND hWnd) { BOOL result = real_DestroyWindow(hWnd); - RedrawWindow(NULL, NULL, NULL, RDW_ERASE | RDW_INVALIDATE | RDW_ALLCHILDREN); - - if (ddraw && ddraw->hWnd != hWnd && ddraw->bnetActive && !FindWindowEx(HWND_DESKTOP, NULL, "SDlgDialog", NULL)) + if (ddraw && ddraw->hWnd != hWnd && ddraw->bnetActive) { - ddraw->bnetActive = FALSE; - mouse_lock(); + RedrawWindow(NULL, NULL, NULL, RDW_ERASE | RDW_INVALIDATE | RDW_ALLCHILDREN); - if (ddraw->windowed && ddraw->bnetD3d9Fullscreen && ddraw->renderer == render_d3d9_main) + if (!FindWindowEx(HWND_DESKTOP, NULL, "SDlgDialog", NULL)) { - ToggleFullscreen(); - ddraw->bnetD3d9Fullscreen = FALSE; + ddraw->bnetActive = FALSE; + mouse_lock(); + + if (ddraw->windowed && ddraw->bnetD3d9Fullscreen && ddraw->renderer == render_d3d9_main) + { + ToggleFullscreen(); + ddraw->bnetD3d9Fullscreen = FALSE; + } } }