xserver: Branch 'master'

[Zephaniah E. Hull]

 hw/xfree86/common/xf86Xinput.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 562ca3f2f9005e7c5ed0a24b0759051ded2173e9 (from 42c2e14b254f6f882b3e79444360ab855db43e27)
Author: Zephaniah E. Hull <warp at agamemnon.b5>
Date:   Mon Jun 18 12:00:49 2007 -0400

    In NewInputDeviceRequest, only call EnableDevice if xf86Screens[0]->vtSema is
    true, preventing unwanted behavior in the case where a device is added while
    the user is in a different VT.

diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index 5430020..c08b15f 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -408,7 +408,7 @@ NewInputDeviceRequest (InputOption *opti
 
     dev = pInfo->dev;
     ActivateDevice(dev);
-    if (dev->inited && dev->startup)
+    if (dev->inited && dev->startup && xf86Screens[0]->vtSema)
         EnableDevice(dev);
 
     *pdev = dev;