diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2021-11-22 14:17:14 +0100 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2021-11-22 14:17:14 +0100 |
| commit | 5d1f437fb42dbd520b81a834fb2b7939ec1a7860 (patch) | |
| tree | 01048f86eb9e5cb4bf297ce8c6cf62f0f8ff9e06 /ui/vnc-clipboard.c | |
| parent | 49aaac3548bc5a4632a14de939d5312b28dc1ba2 (diff) | |
| parent | b9e5628ca5d42994cc6f82752d9bf0bc98f51f64 (diff) | |
| download | focaccia-qemu-5d1f437fb42dbd520b81a834fb2b7939ec1a7860.tar.gz focaccia-qemu-5d1f437fb42dbd520b81a834fb2b7939ec1a7860.zip | |
Merge tag 'fixes-20211122-pull-request' of git://git.kraxel.org/qemu into staging
fixes for 6.2: microvm, ui, modules. # gpg: Signature made Mon 22 Nov 2021 01:39:53 PM CET # gpg: using RSA key A0328CFFB93A17A79901FE7D4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full] # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full] # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full] * tag 'fixes-20211122-pull-request' of git://git.kraxel.org/qemu: microvm: check g_file_set_contents() return value microvm: add missing g_free() call hw/i386/microvm: Reduce annoying debug message in dt_setup_microvm() migration: fix dump-vmstate with modules ui/vnc-clipboard: fix adding notifier twice ui/gtk: graphic_hw_gl_flushed after closing dmabuf->fence_fd ui: fix incorrect pointer position on highdpi with gtk ui: fix incorrect scaling on highdpi with gtk/opengl Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'ui/vnc-clipboard.c')
| -rw-r--r-- | ui/vnc-clipboard.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ui/vnc-clipboard.c b/ui/vnc-clipboard.c index 9f077965d0..67284b556c 100644 --- a/ui/vnc-clipboard.c +++ b/ui/vnc-clipboard.c @@ -316,8 +316,10 @@ void vnc_server_cut_text_caps(VncState *vs) caps[1] = 0; vnc_clipboard_send(vs, 2, caps); - vs->cbpeer.name = "vnc"; - vs->cbpeer.update.notify = vnc_clipboard_notify; - vs->cbpeer.request = vnc_clipboard_request; - qemu_clipboard_peer_register(&vs->cbpeer); + if (!vs->cbpeer.update.notify) { + vs->cbpeer.name = "vnc"; + vs->cbpeer.update.notify = vnc_clipboard_notify; + vs->cbpeer.request = vnc_clipboard_request; + qemu_clipboard_peer_register(&vs->cbpeer); + } } |