[Bug 19185] Don't clear dragData["private"] mid drag

montegoulding · montegoulding · commit d0c4f6afc958 · 2017-02-06T10:26:13.000+11:00
The system appears to touch the drag pasteboard mid drag accessing the
changeCount to increment. As drags either come from an outside source
or the engine if private data exists we can retain until the drag is
complete.
diff --git a/docs/notes/bugfix-19185.md b/docs/notes/bugfix-19185.md
@@ -0,0 +1 @@
+# Ensure the dragData["private"] isn't cleared during a drag
diff --git a/engine/src/clipboard.cpp b/engine/src/clipboard.cpp
@@ -123,7 +123,7 @@ void MCClipboard::ReleaseData()
 bool MCClipboard::PullUpdates() const
 {
     // If ownership has changed, the private clipboard data needs to be cleared
-	if (!m_clipboard->IsOwned())
+	if (!this->IsDragboard() && !m_clipboard->IsOwned())
 		const_cast<MCClipboard*>(this)->ClearPrivateData();
 	
 	// Pass on the request
@@ -1550,3 +1550,8 @@ MCStringEncoding MCClipboard::GuessHTMLEncoding(MCDataRef p_html_data)
 
 	return kMCStringEncodingUTF8;
 }
+
+bool MCClipboard::IsDragboard() const
+{
+	return this == MCdragboard;
+}
diff --git a/engine/src/clipboard.h b/engine/src/clipboard.h
@@ -182,7 +182,7 @@ class MCClipboard :
     static MCClipboard* CreateSystemSelectionClipboard();
     static MCClipboard* CreateSystemDragboard();
     
-    
+	bool IsDragboard() const;
 private:
     
     // The raw clipboard that is being wrapped

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Ensure the dragData["private"] isn't cleared during a drag`