From 795a2759db97111e27b1de3b904dca4ec926bd04 Mon Sep 17 00:00:00 2001
From: Eugenio Favalli <elvenprogrammer@gmail.com>
Date: Mon, 27 Jun 2005 06:29:02 +0000
Subject: - Fixing OpenGL switch to fullscreen crash in windows - Improving
 switch check

---
 src/gui/setup.cpp | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 629c0c86..a01e804f 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -201,23 +201,35 @@ void Setup::action(const std::string &eventId)
     else if (eventId == "apply")
     {
         setVisible(false);
+        bool changed = false;
 
-        if (fsCheckBox->isMarked()) { // Fullscreen
+        if (fsCheckBox->isMarked() && config.getValue("screen", 0) == 0) {
+            // Fullscreen
             config.setValue("screen", 1);
             displayFlags |= SDL_FULLSCREEN;
+            changed = true;
         }
-        else { // Windowed
+        else if(!fsCheckBox->isMarked() && config.getValue("screen", 0) == 1) {
+            // Windowed
             config.setValue("screen", 0);
             displayFlags &= ~SDL_FULLSCREEN;
+            changed = true;
         }
-
-        displayFlags |= SDL_DOUBLEBUF;
-
-        screen = SDL_SetVideoMode(screenW, screenH, bitDepth, displayFlags);
-        if (screen == NULL) {
-            std::cerr << "Couldn't set " << screenW << "x" << screenH << "x" <<
-                bitDepth << " video mode: " << SDL_GetError() << std::endl;
+        
+        if(changed) {
+            displayFlags |= SDL_DOUBLEBUF;
+            if (useOpenGL) {
+                displayFlags |= SDL_OPENGL;
+                SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+            }
+            
+            screen = SDL_SetVideoMode(screenW, screenH, bitDepth, displayFlags);
+            if (screen == NULL) {
+                std::cerr << "Couldn't set " << screenW << "x" <<
+                    screenH << "x" << bitDepth << " video mode: " <<
+                    SDL_GetError() << std::endl;
             exit(1);
+            }
         }
 
         // Sound settings
-- 
cgit v1.2.3-60-g2f50