From 5e9df71e0e1735a60939aa1f931181429ee2afd3 Mon Sep 17 00:00:00 2001
From: Robert Shearman <rob@codeweavers.com>
Date: Thu, 31 Aug 2006 17:20:09 +0100
Subject: [PATCH] ole32: Don't send data changes in DataAdviseHolder_Advise for
 ADVF_PRIMEFIRST connections if we are connected to a data object, since it
 will send the data change for us.

---
 dlls/ole32/oleobj.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c
index 7a00d8fc801..ae06f18935d 100644
--- a/dlls/ole32/oleobj.c
+++ b/dlls/ole32/oleobj.c
@@ -728,9 +728,6 @@ static HRESULT WINAPI DataAdviseHolder_Advise(
 
   if (This->Connections[index].sink != NULL) {
     IAdviseSink_AddRef(This->Connections[index].sink);
-    if(advf & ADVF_PRIMEFIRST) {
-      IDataAdviseHolder_SendOnDataChange(iface, pDataObject, 0, advf);
-    }
 
     /* if we are already connected advise the remote object */
     if (This->delegate)
@@ -748,6 +745,10 @@ static HRESULT WINAPI DataAdviseHolder_Advise(
         }
         This->Connections[index].advf |= WINE_ADVF_REMOTE;
     }
+    else if(advf & ADVF_PRIMEFIRST)
+      /* only do this if we have no delegate, since in the above case the
+       * delegate will do the priming for us */
+      IDataAdviseHolder_SendOnDataChange(iface, pDataObject, 0, advf);
   }
   /*
    * Return the index as the cookie.