diff options
| author | marha <marha@users.sourceforge.net> | 2010-06-19 12:24:02 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-06-19 12:24:02 +0000 |
| commit | 63b723ce3a0a5126c801569bd194d00141922262 (patch) | |
| tree | ab2bda53c577bf2bf5bfb72b6d9705752d33bd83 /xorg-server/hw/xfree86/common | |
| parent | c33be01f08e4ea06dd618cf1c3d5a55dbab24dd1 (diff) | |
| parent | 481fca2e77a44d0f0cd56c2732645726eec9dc6f (diff) | |
| download | vcxsrv-63b723ce3a0a5126c801569bd194d00141922262.tar.gz vcxsrv-63b723ce3a0a5126c801569bd194d00141922262.tar.bz2 vcxsrv-63b723ce3a0a5126c801569bd194d00141922262.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/common')
| -rw-r--r-- | xorg-server/hw/xfree86/common/xf86Helper.c | 7 |
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.
|