Skip to content

Commit

Permalink
Wayland: Fix accessing not owned clipbard
Browse files Browse the repository at this point in the history
  • Loading branch information
hluk committed Oct 24, 2021
1 parent 4d1ee08 commit 66d429a
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions src/platform/x11/systemclipboard/waylandclipboard.cpp
Expand Up @@ -458,19 +458,11 @@ const QMimeData *WaylandClipboard::mimeData(QClipboard::Mode mode) const
if (m_device->selection()) {
return m_device->selection();
}
// This application owns the clipboard via the regular data_device, use it so we don't block ourselves
if (QGuiApplication::clipboard()->ownsClipboard()) {
return QGuiApplication::clipboard()->mimeData(mode);
}
return m_device->receivedSelection();
} else if (mode == QClipboard::Selection) {
if (m_device->primarySelection()) {
return m_device->primarySelection();
}
// This application owns the primary selection via the regular primary_selection_device, use it so we don't block ourselves
if (QGuiApplication::clipboard()->ownsSelection()) {
return QGuiApplication::clipboard()->mimeData(mode);
}
return m_device->receivedPrimarySelection();
}
return nullptr;
Expand Down

0 comments on commit 66d429a

Please sign in to comment.