From 69041f7493b30373390b7ce3539eee4d1157c6c6 Mon Sep 17 00:00:00 2001
From: FunkyFr3sh <cc.red.alert.1@googlemail.com>
Date: Thu, 17 Feb 2022 20:22:17 +0100
Subject: [PATCH] #138 force fullscreen 640x480 if user selects "windowed" in
 the menu

(cherry picked from commit 2edbeabd3e3f96bb31ceea08299ff0914f5bdaa1)
---
 src/dd.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/dd.c b/src/dd.c
index d85c507..3907a4c 100644
--- a/src/dd.c
+++ b/src/dd.c
@@ -864,17 +864,19 @@ HRESULT dd_SetCooperativeLevel(HWND hwnd, DWORD dwFlags)
     {
         static BOOL windowed;
 
-        if (!(dwFlags & DDSCL_FULLSCREEN))
+        if (dwFlags & DDSCL_FULLSCREEN)
+        {
+            g_ddraw->windowed = windowed;
+        }
+        else if (dwFlags & DDSCL_NOWINDOWCHANGES)
         {
             windowed = g_ddraw->windowed;
 
-            g_ddraw->windowed = TRUE;
+            if (GetMenu(g_ddraw->hwnd) != NULL)
+                g_ddraw->windowed = TRUE;
+
             dd_SetDisplayMode(640, 480, 16, SDM_MODE_SET_BY_GAME);
         }
-        else
-        {
-            g_ddraw->windowed = windowed;
-        }
     }
 
     return DD_OK;