Wayland: Fallback to QClipboard if there are null data in WaylandClip…

…board
hluk · Aug 21, 2024 · 3568faa · 3568faa
1 parent e54d698
commit 3568faa
Showing 1 changed file with 8 additions and 3 deletions.
diff --git 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)