aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xfree86/common/xf86Helper.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-06-19 12:15:27 +0000
committermarha <marha@users.sourceforge.net>2010-06-19 12:15:27 +0000
commit481fca2e77a44d0f0cd56c2732645726eec9dc6f (patch)
tree7ec3cb23280cb186027c91a3a8ff2307e10ed66f /xorg-server/hw/xfree86/common/xf86Helper.c
parent85597ff9162e3fe37b73efd9b9e3d92cd793383a (diff)
downloadvcxsrv-481fca2e77a44d0f0cd56c2732645726eec9dc6f.tar.gz
vcxsrv-481fca2e77a44d0f0cd56c2732645726eec9dc6f.tar.bz2
vcxsrv-481fca2e77a44d0f0cd56c2732645726eec9dc6f.zip
xserver and xkeyboard-config git update 19/6/2010
Diffstat (limited to 'xorg-server/hw/xfree86/common/xf86Helper.c')
-rw-r--r--xorg-server/hw/xfree86/common/xf86Helper.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/xorg-server/hw/xfree86/common/xf86Helper.c b/xorg-server/hw/xfree86/common/xf86Helper.c
index a88a1e758..c84f4a0ab 100644
--- a/xorg-server/hw/xfree86/common/xf86Helper.c
+++ b/xorg-server/hw/xfree86/common/xf86Helper.c
@@ -1441,6 +1441,13 @@ xf86MatchDevice(const char *drivername, GDevPtr **sectlist)
*sectlist = NULL;
/*
+ * This can happen when running Xorg -showopts and a module like ati
+ * or vmware tries to load its submodules when xf86ConfigLayout is empty
+ */
+ if (!xf86ConfigLayout.screens)
+ return 0;
+
+ /*
* This is a very important function that matches the device sections
* as they show up in the config file with the drivers that the server
* loads at run time.