Changeset 81025 in vbox for trunk/src/VBox/GuestHost/SharedClipboard/ClipboardDataObjectImpl-win.cpp

Timestamp:

Sep 26, 2019 4:13:25 PM (5 years ago)

Author:

vboxsync

Message:

Shared Clipboard/Transfers: Update.

File:

• trunk/src/VBox/GuestHost/SharedClipboard/ClipboardDataObjectImpl-win.cpp (modified) (3 diffs)

trunk/src/VBox/GuestHost/SharedClipboard/ClipboardDataObjectImpl-win.cpp

@@ -367 +367 @@
                 if (ASMAtomicReadBool(&pTransfer->Thread.fStop))
                 {
-                    LogRel2(("Shared Clipboard: Stopping transfer calculating ...\n"));
+                    LogRel2(("Shared Clipboard: Stopping transfer calculation ...\n"));
                     break;
                 }
@@ -378 +378 @@
             pRootList = NULL;
 
-            if (RT_SUCCESS(rc))
+            if (   RT_SUCCESS(rc)
+                && !ASMAtomicReadBool(&pTransfer->Thread.fStop))
             {
                 LogRel2(("Shared Clipboard: Transfer calculation complete (%zu root entries)\n", pThis->m_lstEntries.size()));
@@ -402 +403 @@
                    LogRel(("Shared Clipboard: No transfer root entries found -- should not happen, please file a bug report\n"));
             }
-            else
+            else if (RT_FAILURE(rc))
                 LogRel(("Shared Clipboard: Transfer failed with %Rrc\n", rc));
         }