xserver: Branch 'master'
Daniel Stone
daniels at kemper.freedesktop.org
Tue Oct 7 16:47:37 PDT 2008
hw/xfree86/common/xf86Config.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 617933e8c259ad12388c0dd13421846a873975e3
Author: Daniel Stone <daniel at fooishbar.org>
Date: Wed Oct 8 02:45:59 2008 +0300
XFree86: Fix DontZap interaction with -retro
-retro will now _not_ override (No)DontZap, if it's set in the config
file.
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 45e776f..5c2ea4b 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -875,8 +875,10 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts)
xf86GetOptValBool(FlagOptions, FLAG_NOTRAPSIGNALS, &xf86Info.notrapSignals);
xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch);
- xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap);
- xf86Info.dontZap |= party_like_its_1989;
+ if (xf86IsOptionSet(FlagOptions, FLAG_DONTZAP))
+ xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap);
+ else
+ xf86Info.dontZap = party_like_its_1989;
xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom);
xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI);
More information about the xorg-commit
mailing list