backup/cnc-ddraw
1
0
Fork 0
mirror of https://github.com/FunkyFr3sh/cnc-ddraw.git synced 2025-03-24 17:49:52 +01:00
Code Issues Projects Releases Activity

only reset d3d9 if not windowed already

Browse Source
This commit is contained in:
FunkyFr3sh 2022-09-23 02:59:02 +02:00
parent 30c15e761a
commit 6e93df0580
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/dd.c
View File

@ -392,17 +392,16 @@ HRESULT dd_RestoreDisplayMode()
WaitForSingleObject(g_ddraw->render.thread, INFINITE); WaitForSingleObject(g_ddraw->render.thread, INFINITE);
g_ddraw->render.thread = NULL; g_ddraw->render.thread = NULL;
} }
}
if (!g_ddraw->windowed)
{
if (g_ddraw->renderer == d3d9_render_main) if (g_ddraw->renderer == d3d9_render_main)
{ {
if (!d3d9_reset(TRUE)) if (!d3d9_reset(TRUE))
d3d9_release(); d3d9_release();
} }
} else
if (!g_ddraw->windowed)
{
if (g_ddraw->renderer != d3d9_render_main)
{ {
ChangeDisplaySettings(NULL, 0); ChangeDisplaySettings(NULL, 0);
} }
@ -1007,14 +1006,17 @@ ULONG dd_Release()
g_ddraw->render.thread = NULL; g_ddraw->render.thread = NULL;
} }
if (g_ddraw->renderer == d3d9_render_main) if (!g_ddraw->windowed)
{ {
if (!d3d9_reset(TRUE)) if (g_ddraw->renderer == d3d9_render_main)
d3d9_release(); {
} if (!d3d9_reset(TRUE))
else if (!g_ddraw->windowed) d3d9_release();
{ }
ChangeDisplaySettings(NULL, 0); else
{
ChangeDisplaySettings(NULL, 0);
}
} }
} }