brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backends/x11: Trap errors from XIChangeProperty

Browse Source 
And report them as warnings instead of crashing.

https://launchpad.net/bugs/2014986

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2960>
This commit is contained in:
Daniel van Vugt 2023-04-14 18:10:36 +08:00 committed by Marge Bot
parent 86b5d9d809
commit dd6be7cf2a
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/backends/x11/meta-input-settings-x11.c
View File

@ -170,6 +170,7 @@ change_property (MetaInputSettings *settings,
int device_id; int device_id;
Atom property_atom; Atom property_atom;
guchar *data_ret; guchar *data_ret;
int err;
property_atom = XInternAtom (xdisplay, property, True); property_atom = XInternAtom (xdisplay, property, True);
if (!property_atom) if (!property_atom)
@ -181,8 +182,19 @@ change_property (MetaInputSettings *settings,
if (!data_ret) if (!data_ret)
return; return;
meta_clutter_x11_trap_x_errors ();
XIChangeProperty (xdisplay, device_id, property_atom, type, XIChangeProperty (xdisplay, device_id, property_atom, type,
format, XIPropModeReplace, data, nitems); format, XIPropModeReplace, data, nitems);
XSync (xdisplay, False);
err = meta_clutter_x11_untrap_x_errors ();
if (err)
{
g_warning ("XIChangeProperty failed on device %d property \"%s\" with X error %d",
device_id,
property,
err);
}
meta_XFree (data_ret); meta_XFree (data_ret);
} }