isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-19 22:54:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

XI2: Avoid a crash in event translation

Browse Source 
It is possible that we get a DeviceChanged event for a device
that is not in the hash table yet. E.g. I've seen this when
using xrandr to change screen resolution. Prevent a crash in
this case.

https://bugzilla.gnome.org/review?bug=678439
This commit is contained in:
Matthias Clasen 2012-06-20 07:19:05 -04:00
parent d571719a3d
commit e3ca87784e
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
clutter/x11/clutter-device-manager-xi2.c
View File

@ -733,12 +733,15 @@ clutter_device_manager_xi2_translate_event (ClutterEventTranslator *translator,
device = g_hash_table_lookup (manager_xi2->devices_by_id, device = g_hash_table_lookup (manager_xi2->devices_by_id,
GINT_TO_POINTER (xev->deviceid)); GINT_TO_POINTER (xev->deviceid));
_clutter_input_device_reset_axes (device); if (device)
_clutter_input_device_reset_scroll_info (device); {
translate_device_classes (backend_x11->xdpy, _clutter_input_device_reset_axes (device);
device, _clutter_input_device_reset_scroll_info (device);
xev->classes, translate_device_classes (backend_x11->xdpy,
xev->num_classes); device,
xev->classes,
xev->num_classes);
}
} }
retval = CLUTTER_TRANSLATE_REMOVE; retval = CLUTTER_TRANSLATE_REMOVE;
break; break;