summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColomban Wendling <[email protected]>2022-04-26 12:30:50 +0200
committerColomban Wendling <[email protected]>2022-05-18 11:49:37 +0200
commitab48cca074ec2a9d90c0aef4d562339419980cd2 (patch)
tree2d557d8c66ce2b26891a2573ca0f6946d6a4c298
parentba311c28ea3f1c03a485e8adb90dbf79cfd4d817 (diff)
downloadmate-settings-daemon-x11-display-error-sanitizting.tar.bz2
mate-settings-daemon-x11-display-error-sanitizting.tar.xz
clipboard: Fix possibly missing trap poppingx11-display-error-sanitizting
-rw-r--r--plugins/clipboard/msd-clipboard-manager.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/clipboard/msd-clipboard-manager.c b/plugins/clipboard/msd-clipboard-manager.c
index ef4007a..a2aedc8 100644
--- a/plugins/clipboard/msd-clipboard-manager.c
+++ b/plugins/clipboard/msd-clipboard-manager.c
@@ -432,9 +432,9 @@ convert_clipboard_manager (MsdClipboardManager *manager,
if (gdk_x11_display_error_trap_pop (display) != Success)
return;
- gdk_x11_display_error_trap_push (display);
-
if (xev->xselectionrequest.property != None) {
+ gdk_x11_display_error_trap_push (display);
+
XGetWindowProperty (manager->priv->display,
xev->xselectionrequest.requestor,
xev->xselectionrequest.property,