[[ RawClipboard ]] Fix various refcounting bugs

livecodefraser · livecodefraser · commit 40579d75dbdf · 2015-09-23T12:08:24.000+01:00
diff --git a/engine/src/clipboard.cpp b/engine/src/clipboard.cpp
@@ -62,13 +62,13 @@ MCClipboard::~MCClipboard()
         MCValueRelease(m_private_data);
 }
 
-bool MCClipboard::Lock() const
+bool MCClipboard::Lock(bool p_skip_pull) const
 {
     // Increase the lock count. If it moves from zero to one, update the
     // contents of this clipboard.
     //
     // TODO: atomic operations
-    if (m_lock_count++ == 0)
+    if (m_lock_count++ == 0 && !p_skip_pull)
     {
         return PullUpdates();
     }
@@ -1152,7 +1152,7 @@ MCClipboard* MCClipboard::CreateSystemDragboard()
 {
     // Drag boards are created in a locked state
     MCClipboard* t_dragboard = new MCClipboard(MCRawClipboard::CreateSystemDragboard());
-    t_dragboard->Lock();
+    t_dragboard->Lock(true);
     t_dragboard->Clear();
     return t_dragboard;
 }
diff --git a/engine/src/clipboard.h b/engine/src/clipboard.h
@@ -40,7 +40,7 @@ class MCClipboard :
     // For efficiency, a clipboard used as a drag board should be permanently
     // locked as this inhibits automatic updates. (The contents of the drag
     // board are only meaningful during a drag-and-drop operation).
-    bool Lock() const;
+    bool Lock(bool p_skip_pull = false) const;
     bool Unlock() const;
     
     // Clears the contents of this clipboard.
diff --git a/engine/src/desktop.cpp b/engine/src/desktop.cpp
@@ -546,7 +546,8 @@ void MCPlatformHandleDragLeave(MCPlatformWindowRef p_window)
     // On some platforms (Mac and iOS), the drag board used for drag-and-drop
     // operations may not be the main drag board. Reset the drag board back to
     // the main one after the drag has left.
-    MCdragboard->Rebind(MCRawClipboard::CreateSystemDragboard());
+    MCAutoRefcounted<MCRawClipboard> t_dragboard(MCRawClipboard::CreateSystemDragboard());
+    MCdragboard->Rebind(t_dragboard);
     
     MCdispatcher -> wmdragleave(p_window);
 }
diff --git a/engine/src/filedefs.h b/engine/src/filedefs.h
@@ -20,6 +20,8 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #ifndef	FILEDEFS_H
 #define	FILEDEFS_H
 
+#include "typedefs.h"
+
 #define SIGNATURE "# MetaCard "
 
 #define READ_PIPE_SIZE 16384

Original file line number	Diff line number	Diff line change
`@@ -62,13 +62,13 @@ MCClipboard::~MCClipboard()`
`62`	`62`	`MCValueRelease(m_private_data);`
`63`	`63`	`}`
`64`	`64`
`65`		`-bool MCClipboard::Lock() const`
	`65`	`+bool MCClipboard::Lock(bool p_skip_pull) const`
`66`	`66`	`{`
`67`	`67`	`// Increase the lock count. If it moves from zero to one, update the`
`68`	`68`	`// contents of this clipboard.`
`69`	`69`	`//`
`70`	`70`	`// TODO: atomic operations`
`71`		`- if (m_lock_count++ == 0)`
	`71`	`+ if (m_lock_count++ == 0 && !p_skip_pull)`
`72`	`72`	`{`
`73`	`73`	`return PullUpdates();`
`74`	`74`	`}`
`@@ -1152,7 +1152,7 @@ MCClipboard* MCClipboard::CreateSystemDragboard()`
`1152`	`1152`	`{`
`1153`	`1153`	`// Drag boards are created in a locked state`
`1154`	`1154`	`MCClipboard* t_dragboard = new MCClipboard(MCRawClipboard::CreateSystemDragboard());`
`1155`		`- t_dragboard->Lock();`
	`1155`	`+ t_dragboard->Lock(true);`
`1156`	`1156`	`t_dragboard->Clear();`
`1157`	`1157`	`return t_dragboard;`
`1158`	`1158`	`}`
Original file line number	Diff line number	Diff line change
`@@ -546,7 +546,8 @@ void MCPlatformHandleDragLeave(MCPlatformWindowRef p_window)`
`546`	`546`	`// On some platforms (Mac and iOS), the drag board used for drag-and-drop`
`547`	`547`	`// operations may not be the main drag board. Reset the drag board back to`
`548`	`548`	`// the main one after the drag has left.`
`549`		`- MCdragboard->Rebind(MCRawClipboard::CreateSystemDragboard());`
	`549`	`+ MCAutoRefcounted<MCRawClipboard> t_dragboard(MCRawClipboard::CreateSystemDragboard());`
	`550`	`+ MCdragboard->Rebind(t_dragboard);`
`550`	`551`
`551`	`552`	`MCdispatcher -> wmdragleave(p_window);`
`552`	`553`	`}`