diff options
| author | Carlos Garnacho <carlosg@gnome.org> | 2018-09-07 19:31:35 +0200 |
|---|---|---|
| committer | Carlos Garnacho <carlosg@gnome.org> | 2018-09-07 19:31:35 +0200 |
| commit | b3b3bf1baeca72b246fe8e0d915a9f83ce0b0a22 (patch) | |
| tree | 608ac1abb965f69449d849f78e7055b07270a1b7 | |
| parent | 9cfd1853160e2de922b5248a87c7fa290c8848a9 (diff) | |
| download | mutter-wip/carlosg/issue-294.tar.gz | |
backends: push missing error trapwip/carlosg/issue-294
This went MIA in commit 390314adfb6, and causes asserts when
trying to pop a non-existent error trap a bit later.
Closes: #294
| -rw-r--r-- | src/backends/x11/meta-input-settings-x11.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/backends/x11/meta-input-settings-x11.c b/src/backends/x11/meta-input-settings-x11.c index 14a199e7e..d559c92a7 100644 --- a/src/backends/x11/meta-input-settings-x11.c +++ b/src/backends/x11/meta-input-settings-x11.c @@ -783,6 +783,9 @@ meta_input_settings_x11_set_stylus_button_map (MetaInputSettings *setti /* Grab the puke bucket! */ xdev = device_ensure_xdevice (device); + + meta_x11_error_trap_push (display->x11_display); + if (xdev) { guchar map[8] = { |