summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColomban Wendling <[email protected]>2022-04-26 12:30:50 +0200
committerVictor Kareh <[email protected]>2026-08-21 02:36:36 +0000
commit08a74431399885b6bea7359472ded03acd56c7df (patch)
tree36611cccc7ac7f929a5586c2b5f791eec817cb08
parent0787cee6c8e71dafee0d2dfa862ecc9b1344fd5e (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 b885b89..dee2416 100644
--- a/plugins/clipboard/msd-clipboard-manager.c
+++ b/plugins/clipboard/msd-clipboard-manager.c
@@ -445,9 +445,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,