From bb0c7a3d7806fe0b4110c42c3487829c3f266b21 Mon Sep 17 00:00:00 2001 From: Kurt Hindenburg Date: Fri, 8 Jul 2016 09:51:49 -0400 Subject: [PATCH] Test supportsSelection() when using QClipboard::Selection setMimeData appears to delete mimeData if supportsSelection() is false. So we'll check it. Patch from rjvbertin gmail com --- src/TerminalDisplay.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp index 8e43b7ee..63e40ea7 100644 --- a/src/TerminalDisplay.cpp +++ b/src/TerminalDisplay.cpp @@ -2883,7 +2883,9 @@ void TerminalDisplay::copyToX11Selection() mimeData->setText(text); mimeData->setHtml(html); - QApplication::clipboard()->setMimeData(mimeData, QClipboard::Selection); + if (QApplication::clipboard()->supportsSelection()) { + QApplication::clipboard()->setMimeData(mimeData, QClipboard::Selection); + } if (_autoCopySelectedText) QApplication::clipboard()->setMimeData(mimeData, QClipboard::Clipboard); @@ -2914,8 +2916,10 @@ void TerminalDisplay::pasteFromClipboard(bool appendEnter) void TerminalDisplay::pasteFromX11Selection(bool appendEnter) { - QString text = QApplication::clipboard()->text(QClipboard::Selection); - doPaste(text, appendEnter); + if (QApplication::clipboard()->supportsSelection()) { + QString text = QApplication::clipboard()->text(QClipboard::Selection); + doPaste(text, appendEnter); + } } /* ------------------------------------------------------------------------- */