Changeset 97761 in vbox

Timestamp:

Dec 7, 2022 3:57:36 PM (2 years ago)

Author:

vboxsync

Message:

DnD/Main: Don't set any (new) progress if the progress object already has been completed and/or cancelled [addendum to r154824].

File:

• trunk/src/VBox/Main/src-client/GuestDnDPrivate.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-client/GuestDnDPrivate.cpp

@@ -452 +452 @@
             LogRel(("DnD: Guest reported error %Rrc\n", rcOp));
 
-            if (   !fCompleted
-                && !fCanceled)
+            if (!fCompleted)
                 hr = m_pProgress->i_notifyComplete(VBOX_E_DND_ERROR,
                                                    COM_IIDOF(IGuest),
@@ -465 +464 @@
             LogRel2(("DnD: Guest cancelled operation\n"));
 
-            if (   !fCompleted
-                && !fCanceled)
+            if (!fCanceled)
             {
                 hr = m_pProgress->Cancel();
                 AssertComRC(hr);
+            }
+
+            if (!fCompleted)
+            {
                 hr = m_pProgress->i_notifyComplete(S_OK);
                 AssertComRC(hr);