From 3568faa110895b3a25d55597a86cdad169626569 Mon Sep 17 00:00:00 2001 From: Lukas Holecek Date: Wed, 21 Aug 2024 09:24:59 +0200 Subject: [PATCH] Wayland: Fallback to QClipboard if there are null data in WaylandClipboard --- src/platform/x11/x11platformclipboard.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/platform/x11/x11platformclipboard.cpp b/src/platform/x11/x11platformclipboard.cpp index ecae271c37..bfe90157f2 100644 --- a/src/platform/x11/x11platformclipboard.cpp +++ b/src/platform/x11/x11platformclipboard.cpp @@ -162,10 +162,15 @@ void X11PlatformClipboard::setData(ClipboardMode mode, const QVariantMap &dataMa const QMimeData *X11PlatformClipboard::rawMimeData(ClipboardMode mode) const { - if ( X11Info::isPlatformX11() ) - return DummyClipboard::rawMimeData(mode); + if ( !X11Info::isPlatformX11() ) { + auto data = WaylandClipboard::instance()->mimeData( modeToQClipboardMode(mode) ); + if (data) + return data; + COPYQ_LOG( QStringLiteral("Null data in Wayland %1") + .arg(mode == ClipboardMode::Clipboard ? "clipboard" : "selection") ); + } - return WaylandClipboard::instance()->mimeData( modeToQClipboardMode(mode) ); + return DummyClipboard::rawMimeData(mode); } void X11PlatformClipboard::onChanged(int mode)