From 872ece5a69608db8c0abfee7eb91ff869db25f34 Mon Sep 17 00:00:00 2001
From: Toni Spets <toni.spets@iki.fi>
Date: Mon, 8 Nov 2010 22:00:07 +0200
Subject: [PATCH] Honor windowed mode again

---
 render_opengl.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/render_opengl.c b/render_opengl.c
index e449ed2..1039a9e 100644
--- a/render_opengl.c
+++ b/render_opengl.c
@@ -72,6 +72,11 @@ HRESULT WINAPI render_opengl_SetDisplayMode(DWORD width, DWORD height)
 {
     DEVMODE mode;
 
+    if(ddraw->windowed)
+    {
+        return DD_OK;
+    }
+
     EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &render_opengl.restore);
 
     memset(&mode, 0, sizeof(DEVMODE));
@@ -86,8 +91,11 @@ HRESULT WINAPI render_opengl_SetDisplayMode(DWORD width, DWORD height)
 
 HRESULT WINAPI render_opengl_RestoreDisplayMode(void)
 {
-    render_opengl.restore.dmFields = DM_BITSPERPEL|DM_PELSWIDTH|DM_PELSHEIGHT|DM_DISPLAYFLAGS|DM_DISPLAYFREQUENCY|DM_POSITION;
-    ChangeDisplaySettings(&render_opengl.restore, 0);
+    if(!ddraw->windowed)
+    {
+        render_opengl.restore.dmFields = DM_BITSPERPEL|DM_PELSWIDTH|DM_PELSHEIGHT|DM_DISPLAYFLAGS|DM_DISPLAYFREQUENCY|DM_POSITION;
+        ChangeDisplaySettings(&render_opengl.restore, 0);
+    }
     return DD_OK;
 }