Index: /trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp
===================================================================
--- /trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp	(revision 80550)
+++ /trunk/src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc.cpp	(revision 80551)
@@ -1333,25 +1333,25 @@
             #endif /* VBOX_WITH_SHARED_CLIPBOARD_URI_LIST */
                         {
-                            if (g_pfnExtension)
-                            {
-                                VBOXCLIPBOARDEXTPARMS parms;
-                                RT_ZERO(parms);
-                                parms.u32Format = u32Formats;
-
-                                g_pfnExtension(g_pvExtension, VBOX_CLIPBOARD_EXT_FN_FORMAT_ANNOUNCE, &parms, sizeof (parms));
-                            }
-
-                            VBOXCLIPBOARDCLIENTCMDCTX cmdCtx;
-                            RT_ZERO(cmdCtx);
-
-                            SHAREDCLIPBOARDFORMATDATA formatData;
-                            RT_ZERO(formatData);
-
-                            formatData.uFormats = u32Formats;
-
-                            rc = VBoxClipboardSvcImplFormatAnnounce(pClient, &cmdCtx, &formatData);
+                        if (g_pfnExtension)
+                        {
+                            VBOXCLIPBOARDEXTPARMS parms;
+                            RT_ZERO(parms);
+                            parms.u32Format = u32Formats;
+
+                            g_pfnExtension(g_pvExtension, VBOX_CLIPBOARD_EXT_FN_FORMAT_ANNOUNCE, &parms, sizeof (parms));
                         }
+
+                        VBOXCLIPBOARDCLIENTCMDCTX cmdCtx;
+                        RT_ZERO(cmdCtx);
+
+                        SHAREDCLIPBOARDFORMATDATA formatData;
+                        RT_ZERO(formatData);
+
+                        formatData.uFormats = u32Formats;
+
+                        rc = VBoxClipboardSvcImplFormatAnnounce(pClient, &cmdCtx, &formatData);
                     }
                 }
+            }
             }
 
@@ -1754,5 +1754,6 @@
        with the high bit set. */
     SSMR3PutU32(pSSM, UINT32_C(0x80000002));
-    int rc = SSMR3PutStructEx(pSSM, pClient, sizeof(*pClient), 0 /*fFlags*/, &g_aClipboardClientDataFields[0], NULL);
+    int rc = SSMR3PutStructEx(pSSM, &pClient->State, sizeof(pClient->State), 
+                              0 /*fFlags*/, &g_aClipboardClientDataFields[0], NULL);
     AssertRCReturn(rc, rc);
 
@@ -1786,5 +1787,6 @@
     if (lenOrVer == UINT32_C(0x80000002))
     {
-        rc = SSMR3GetStructEx(pSSM, pClient, sizeof(*pClient), 0 /*fFlags*/, &g_aClipboardClientDataFields[0], NULL);
+        rc = SSMR3GetStructEx(pSSM, &pClient->State, sizeof(pClient->State),
+                              0 /*fFlags*/, &g_aClipboardClientDataFields[0], NULL);
         AssertRCReturn(rc, rc);
     }