Move property retrieval to PropertyNotify, so we can be sure it has been set

1 files changed, 15 insertions, 13 deletions

diff --git a/hw/xwin/winclipboardxevents.c b/hw/xwin/winclipboardxevents.c
index 6e9aaaff2..d34707a1b 100644
--- a/hw/xwin/winclipboardxevents.c
+++ b/hw/xwin/winclipboardxevents.c
@@ -521,6 +521,21 @@ winClipboardFlushXEvents (HWND hwnd,
 		}
 	    }
 
+        case SelectionClear:
+          winDebug("SelectionClear - doing nothing\n");
+          break;
+
+	case PropertyNotify:
+          {
+            char *pszAtomName;
+	    pszAtomName = XGetAtomName (pDisplay, event.xproperty.atom);
+	    winDebug("winClipboardFlushXEvents - SelectionNotify - ATOM: %s\n", pszAtomName);
+	    XFree (pszAtomName);
+          }
+
+          if (event.xproperty.atom != atomLocalProperty)
+            break;
+
 	  /* Retrieve the size of the stored data */
 	  iReturn = XGetWindowProperty (pDisplay,
 					iWindow,
@@ -778,19 +793,6 @@ winClipboardFlushXEvents (HWND hwnd,
             }
 	  return WIN_XEVENTS_NOTIFY;
 
-        case SelectionClear:
-          winDebug("SelectionClear - doing nothing\n");
-          break;
-
-	case PropertyNotify:
-          {
-            char *pszAtomName;
-	    pszAtomName = XGetAtomName (pDisplay, event.xproperty.atom);
-	    winDebug("winClipboardFlushXEvents - SelectionNotify - ATOM: %s\n", pszAtomName);
-	    XFree (pszAtomName);
-          }
-	  break;
-
 	case MappingNotify:
 	  break;