summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2011-12-18 21:03:21 +0000
committerColin Guthrie <colin@mageia.org>2011-12-18 21:03:21 +0000
commit995fb5e9638bfa412a24a40af79ab014bc3a4fda (patch)
tree9ccd7cbc7e34e83bd8ae569a51dde58eed1ffa84
parentda4293191914420d37335ab26949161781311318 (diff)
downloaddrakx-kbd-mouse-x11-995fb5e9638bfa412a24a40af79ab014bc3a4fda.tar
drakx-kbd-mouse-x11-995fb5e9638bfa412a24a40af79ab014bc3a4fda.tar.gz
drakx-kbd-mouse-x11-995fb5e9638bfa412a24a40af79ab014bc3a4fda.tar.bz2
drakx-kbd-mouse-x11-995fb5e9638bfa412a24a40af79ab014bc3a4fda.tar.xz
drakx-kbd-mouse-x11-995fb5e9638bfa412a24a40af79ab014bc3a4fda.zip
evdev needs to be loaded before calling getInputDevices_and_usb else it will lead to a crash (pterjan)
-rw-r--r--NEWS2
-rw-r--r--lib/mouse.pm4
2 files changed, 6 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index f7eec2f..fe4c018 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@
- display_driver_helper: use the new modprobe --resolve-alias instead
of manually parsing --dry-run output
- convert mouse helper to use udevadm in order to work with udev 175+
+- evdev needs to be loaded before calling getInputDevices_and_usb else
+ it will lead to a crash
Version 0.98 - 07 November 2011
- display_driver_helper: allow automatic loading of the implicit driver
diff --git a/lib/mouse.pm b/lib/mouse.pm
index 11cb30f..16dad30 100644
--- a/lib/mouse.pm
+++ b/lib/mouse.pm
@@ -286,6 +286,10 @@ sub detect {
detect_devices::probe_category('input/tablet');
detect_devices::probe_category('input/touchscreen');
+ # evdev needs to be loaded before calling getInputDevices_and_usb
+ # else it will lead to a crash
+ eval { modules::load("evdev") };
+
my @wacom = _probe_usb_wacom_devices();
$modules_conf->get_probeall("usb-interface") and eval { modules::load('usbhid') };