Deactivating OpenGL by default on Windows

For Linux OpenGL was already deactivated.
For OSX it is still by default switched on.

Reviewed-by: Jaxad0127

2 files changed, 13 insertions, 3 deletions

diff --git a/src/client.cpp b/src/client.cpp
index 482bb9dc..8def205b 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1090,7 +1090,7 @@ void Client::initConfiguration()
 {
     // Fill configuration with defaults
     config.setValue("hwaccel", false);
-#if (defined __APPLE__ || defined WIN32) && defined USE_OPENGL
+#if defined __APPLE__ && defined USE_OPENGL
     config.setValue("opengl", true);
 #else
     config.setValue("opengl", false);
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index b576f302..b14a8654 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -440,8 +440,18 @@ void Setup_Video::apply()
         config.setValue("opengl", mOpenGLCheckBox->isSelected());
 
         // OpenGL can currently only be changed by restarting, notify user.
-        new OkDialog(_("Changing to OpenGL"),
-                     _("Applying change to OpenGL requires restart."));
+        if (mOpenGLCheckBox->isSelected())
+        {
+            new OkDialog(_("Changing to OpenGL"),
+                         _("Applying change to OpenGL requires restart. "
+                           "In case OpenGL messes up your game graphics, restart "
+                           "the game with the command line option \"--no-opengl\"."));
+        }
+        else
+        {
+            new OkDialog(_("Deactivating OpenGL"),
+                         _("Applying change to OpenGL requires restart."));
+        }
     }
 
     mFps = mFpsCheckBox->isSelected() ? (int) mFpsSlider->getValue() : 0;