From 489a429bea6739dfa25503b9329bd9e33bffb856 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Thu, 25 Sep 2008 00:15:44 +0000
Subject: Merged the Tametomo branch into trunk.

---
 src/gui/setup_video.cpp | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'src/gui/setup_video.cpp')

diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index 0e85138c..dd56ee2f 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -280,15 +280,17 @@ void Setup_Video::apply()
     bool fullscreen = mFsCheckBox->isSelected();
     if (fullscreen != (config.getValue("screen", 0) == 1))
     {
+ 
+        /* Commented  out the openGL test because
+         * the fullscreen mode change works fine, but
+         * will need to test it on windows so not
+         * deleting entirely until then  --kraant*/
 
-        /*Commented  out the openGL test because
- *        the fullscreen mode change works fine, but
- *        will need to test it on windows so not
- *        deleting entirely until then  --kraant*/
-
+#ifdef WIN32
         // checks for opengl usage
-        /*if (!(config.getValue("opengl", 0) == 1))
-        {*/
+        if (!(config.getValue("opengl", 0) == 1))
+        {
+#endif
             if (!graphics->setFullscreen(fullscreen))
             {
                 fullscreen = !fullscreen;
@@ -302,10 +304,12 @@ void Setup_Video::apply()
                     logger->error(error.str());
                 }
             }
-        /*} else {
+#ifdef WIN32
+        } else {
             new OkDialog("Switching to full screen",
                     "Restart needed for changes to take effect.");
-        }*/
+        }
+#endif
         config.setValue("screen", fullscreen ? 1 : 0);
     }
 
-- 
cgit v1.2.3-70-g09d2