X11: Get clipboard before calling X11 functions

hluk · Jul 23, 2017 · 8624a2a · 8624a2a
1 parent 2e18eab
commit 8624a2a
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/platform/x11/x11platformclipboard.cpp b/src/platform/x11/x11platformclipboard.cpp
@@ -115,9 +115,6 @@ void X11PlatformClipboard::onSelectionChanged()
 {
     m_timerResetSelection.stop();
 
-    if ( waitIfSelectionIncomplete() )
-        return;
-
     // Always assume that only plain text can be in primary selection buffer.
     // Asking a app for bigger data when mouse selection changes can make the app hang for a moment.
     const QVariantMap data = DummyClipboard::data( Selection, QStringList(mimeText) );
@@ -128,6 +125,10 @@ void X11PlatformClipboard::onSelectionChanged()
     if (m_selectionData == data)
         return;
 
+    // Qt clipboard data can be in invalid state after this call.
+    if ( waitIfSelectionIncomplete() )
+        return;
+
     m_selectionData = data;
     emit changed(Selection);