fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-05-09 04:58:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

XFree86: Fix DontZap interaction with -retro

Browse source 
-retro will now _not_ override (No)DontZap, if it's set in the config
file.
This commit is contained in:
Daniel Stone 2008-10-08 02:45:59 +03:00
parent d80bae2237
commit 617933e8c2
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hw/xfree86/common/xf86Config.c
View file

@ -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);