2 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 6d19b2e1e9a..7bbbc04d056 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-12  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xfns.c (select_visual): Don't call error if XGetVisualInfo returns
+        more than one visual (Bug#5938).
+
 2010-04-12  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * Makefile.in (C_SWITCH_SYSTEM,C_SWITCH_MACHINE,C_SWITCH_X_SITE): Undefine.
diff --git a/src/xfns.c b/src/xfns.c
index e02174e55fa..ea88c840d54 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4129,7 +4129,7 @@ select_visual (dpyinfo)
       vinfo_template.screen = XScreenNumberOfScreen (screen);
       vinfo = XGetVisualInfo (dpy, VisualIDMask | VisualScreenMask,
                               &vinfo_template, &n_visuals);
-      if (n_visuals != 1)
+      if (n_visuals <= 0)
         fatal ("Can't get proper X visual info");
 
       dpyinfo->n_planes = vinfo->depth;