From 0c6a0fba4b6388433f3a41fa423780b5d722e9bc Mon Sep 17 00:00:00 2001 From: FunkyFr3sh Date: Sat, 8 Jun 2024 21:56:29 +0200 Subject: [PATCH] remove duplicate code --- src/dd.c | 49 +++++++++++-------------------------------------- 1 file changed, 11 insertions(+), 38 deletions(-) diff --git a/src/dd.c b/src/dd.c index cc2d248..73ebcf6 100644 --- a/src/dd.c +++ b/src/dd.c @@ -541,20 +541,18 @@ HRESULT dd_GetMonitorFrequency(LPDWORD lpdwFreq) HRESULT dd_RestoreDisplayMode() { - if (!g_ddraw.render.run) + if (g_ddraw.render.run) { - return DD_OK; - } + EnterCriticalSection(&g_ddraw.cs); + g_ddraw.render.run = FALSE; + ReleaseSemaphore(g_ddraw.render.sem, 1, NULL); + LeaveCriticalSection(&g_ddraw.cs); - EnterCriticalSection(&g_ddraw.cs); - g_ddraw.render.run = FALSE; - ReleaseSemaphore(g_ddraw.render.sem, 1, NULL); - LeaveCriticalSection(&g_ddraw.cs); - - if (g_ddraw.render.thread) - { - WaitForSingleObject(g_ddraw.render.thread, INFINITE); - g_ddraw.render.thread = NULL; + if (g_ddraw.render.thread) + { + WaitForSingleObject(g_ddraw.render.thread, INFINITE); + g_ddraw.render.thread = NULL; + } } if (!g_config.windowed) @@ -1433,32 +1431,7 @@ ULONG dd_Release() cfg_save(); } - if (g_ddraw.render.run) - { - EnterCriticalSection(&g_ddraw.cs); - g_ddraw.render.run = FALSE; - ReleaseSemaphore(g_ddraw.render.sem, 1, NULL); - LeaveCriticalSection(&g_ddraw.cs); - - if (g_ddraw.render.thread) - { - WaitForSingleObject(g_ddraw.render.thread, INFINITE); - g_ddraw.render.thread = NULL; - } - } - - if (!g_config.windowed) - { - if (g_ddraw.renderer == d3d9_render_main && !g_config.nonexclusive) - { - if (!d3d9_reset(TRUE)) - d3d9_release(); - } - else - { - ChangeDisplaySettings(NULL, 0); - } - } + dd_RestoreDisplayMode(); if (g_ddraw.render.hdc) {