Merged Ryan's changes

libsdl-org · Oct 11, 2012 · e7cbb19 · e7cbb19
2 parents 661fe79 + ad7cbfb
commit e7cbb19
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/video/x11/SDL_x11window.c b/src/video/x11/SDL_x11window.c
@@ -993,11 +993,13 @@ X11_SetWindowFullscreenViaWM(_THIS, SDL_Window * window, SDL_VideoDisplay * _dis
         X11_SetNetWMState(_this, data->xwindow, flags);
     }
 
-	if( fullscreen ) {
-		XInstallColormap(display, data->colormap);
-	} else {
-		XUninstallColormap(display, data->colormap);
-	}
+    if (data->visual->class == DirectColor) {
+        if ( fullscreen ) {
+            XInstallColormap(display, data->colormap);
+        } else {
+            XUninstallColormap(display, data->colormap);
+        }
+    }
 
     XFlush(display);
 }