From 481fca2e77a44d0f0cd56c2732645726eec9dc6f Mon Sep 17 00:00:00 2001 From: marha Date: Sat, 19 Jun 2010 12:15:27 +0000 Subject: xserver and xkeyboard-config git update 19/6/2010 --- xorg-server/hw/xfree86/common/xf86Helper.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'xorg-server/hw/xfree86/common') 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 @@ -1440,6 +1440,13 @@ xf86MatchDevice(const char *drivername, GDevPtr **sectlist) if (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 -- cgit v1.2.3