# HG changeset patch
# User Sam Lantinga <slouken@libsdl.org>
# Date 1349991867 25200
# Node ID 028529a31bc4589711d773f4f28f23420bc19c21
# Parent  833a983f218ef2c13a2c5b7a0bec789fd90aeaf0# Parent  b4e467b7761a46039be13363801937b1ba7248e5
Merged Ryan's changes

diff -r b4e467b7761a -r 028529a31bc4 src/video/x11/SDL_x11window.c
--- a/src/video/x11/SDL_x11window.c	Thu Oct 11 17:20:43 2012 -0400
+++ b/src/video/x11/SDL_x11window.c	Thu Oct 11 14:44:27 2012 -0700
@@ -993,11 +993,13 @@
         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);
 }