summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhillip Wood <phillip.wood@dunelm.org.uk>2020-04-11 16:08:18 +0100
committerRobert Mader <robert.mader@posteo.de>2020-04-12 23:43:01 +0200
commitad500ef4e5cfe60edaaab22bc3333e8a3584ee25 (patch)
treee306375c254dd7447df8c89e20aad97aa325d150
parent9a2471db477becded8c1529b83305901b6377ccf (diff)
downloadmutter-ad500ef4e5cfe60edaaab22bc3333e8a3584ee25.tar.gz
input-settings: fix device list iteration
Dereference the loop variable rather than the original list head. This fixes a regression introduced in 4413b86a3 ("backends: Replace ClutterDeviceManager usage in favor of ClutterSeat", 2019-10-04) which broke button scrolling with trackballs. Closes:https://gitlab.gnome.org/GNOME/mutter/-/issues/1120 (cherry picked from commit 3e967d731a730cb4afb46f115570bb25f54c4195)
-rw-r--r--src/backends/meta-input-settings.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backends/meta-input-settings.c b/src/backends/meta-input-settings.c
index 2028570c0..5b2cee29f 100644
--- a/src/backends/meta-input-settings.c
+++ b/src/backends/meta-input-settings.c
@@ -818,7 +818,7 @@ update_trackball_scroll_button (MetaInputSettings *input_settings,
for (l = devices; l; l = l->next)
{
- device = devices->data;
+ device = l->data;
if (input_settings_class->is_trackball_device (input_settings, device))
input_settings_class->set_scroll_button (input_settings, device, button);