From 97f4599ac1c4cd58ca98a9e60ac4ecbbbe0a3b95 Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Sat, 19 Sep 2020 22:58:50 +0100 Subject: [PATCH] [klipper] Check version before calling v2 DataDevice methods Calling a V2 method when our proxy is just at V1 is a fatal error. This wasn't guarded. V2 isn't implemented fully anyway. BUG: 424709 --- klipper/systemclipboard/waylandclipboard.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/klipper/systemclipboard/waylandclipboard.cpp b/klipper/systemclipboard/waylandclipboard.cpp index ff5580475..13573af2e 100644 --- a/klipper/systemclipboard/waylandclipboard.cpp +++ b/klipper/systemclipboard/waylandclipboard.cpp @@ -312,7 +312,10 @@ void WaylandClipboard::clear(QClipboard::Mode mode) if (mode == QClipboard::Clipboard) { m_device->set_selection(nullptr); } else if (mode == QClipboard::Selection) { - m_device->set_primary_selection(nullptr); + if (zwlr_data_control_device_v1_get_version(m_device->object()) >= + ZWLR_DATA_CONTROL_DEVICE_V1_SET_PRIMARY_SELECTION_SINCE_VERSION) { + m_device->set_primary_selection(nullptr); + } } }