frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dix: compare the grab type, not the tempGrab type 

No functional change. To get here, GrabMatchesSecond() needs to be TRUE and
for that the two grab types must be identical.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
This commit is contained in:
Peter Hutterer 2011-12-07 13:54:28 +10:00
parent b9d6ae42b6
commit 97d79dd740
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dix/events.c
View File

@ -3816,7 +3816,7 @@ CheckPassiveGrab(DeviceIntPtr device, GrabPtr grab, InternalEvent *event,
Since XGrabDeviceButton requires to specify the Since XGrabDeviceButton requires to specify the
modifierDevice explicitly, we don't override this choice. modifierDevice explicitly, we don't override this choice.
*/ */
if (tempGrab->type < GenericEvent) if (grab->type < GenericEvent)
{ {
grab->device = device; grab->device = device;
grab->modifierDevice = GetMaster(device, MASTER_KEYBOARD); grab->modifierDevice = GetMaster(device, MASTER_KEYBOARD);