ChangeSet ID:	11165
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	julliard@wine.codeweavers.com	2004/02/19 19:04:51

Modified files:
	dlls/x11drv    : palette.c 

Log message:
	Finlo Boyde <fin@neeps.net>
	Fix for deadlock when using private colormap.

Patch: http://cvs.winehq.org/patch.py?id=11165

Old revision  New revision  Changes     Path
 1.3           1.4           +3 -3       wine/dlls/x11drv/palette.c

Index: wine/dlls/x11drv/palette.c
diff -u -p wine/dlls/x11drv/palette.c:1.3 wine/dlls/x11drv/palette.c:1.4
--- wine/dlls/x11drv/palette.c:1.3	Thu Jun 20 03:58:18 2013
+++ wine/dlls/x11drv/palette.c	Thu Jun 20 03:58:18 2013
@@ -170,11 +170,11 @@ int X11DRV_PALETTE_Init(void)
 		    win_attr.colormap = X11DRV_PALETTE_PaletteXColormap;
 		    XChangeWindowAttributes( gdi_display, root_window, CWColormap, &win_attr );
 		}
-		break;
 	    }
+	} else {
+	  X11DRV_PALETTE_PaletteXColormap = XCreateColormap(gdi_display, root_window,
+							    visual, AllocNone);
 	}
-        X11DRV_PALETTE_PaletteXColormap = XCreateColormap(gdi_display, root_window,
-                                                          visual, AllocNone);
         wine_tsx11_unlock();
         break;
     }