Only checking for AEI on leaves us with the possibility that AEI is forced off
in the config, but devices are added through evdev nonetheless. A keyboard
added this way can CTRL+C the server. Checking for both AAD and AEI is safer
here.
---
tbh, I'm not sure whether we shouldn't just switch to RAW regardless. We do
restore the mode anyway on close, so this condition is arguably not necessary.

 hw/xfree86/os-support/linux/lnx_init.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/xfree86/os-support/linux/lnx_init.c 
b/hw/xfree86/os-support/linux/lnx_init.c
index 6ee8ed6..1f0121e 100644
--- a/hw/xfree86/os-support/linux/lnx_init.c
+++ b/hw/xfree86/os-support/linux/lnx_init.c
@@ -287,7 +287,7 @@ xf86OpenConsole(void)
             * we're expecting the devices to be added (i.e. evdev) and we
             * have to set it manually.
             */
-           if (xf86Info.allowEmptyInput)
+           if (xf86Info.allowEmptyInput || xf86Info.autoAddDevices )
            {
                struct termios nTty;
 
-- 
1.6.0.6
_______________________________________________
xorg mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/xorg

Reply via email to