Changeset 71849 in vbox for trunk

Timestamp:

Apr 12, 2018 12:32:44 PM (7 years ago)

Author:

vboxsync

Message:

Guest Control/Main: Added more cancellation code to copyTo/copyFrom tasks.

File:

• trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp (modified) (3 diffs)

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

@@ -165 +165 @@
         return VINF_SUCCESS;
 
-    BOOL fCanceled;
     BOOL fCompleted;
-    if (   SUCCEEDED(mProgress->COMGETTER(Canceled(&fCanceled)))
-        && !fCanceled
-        && SUCCEEDED(mProgress->COMGETTER(Completed(&fCompleted)))
+    if (   SUCCEEDED(mProgress->COMGETTER(Completed(&fCompleted)))
         && !fCompleted)
     {
@@ -337 +334 @@
             break;
     }
+
+    if (   SUCCEEDED(mProgress->COMGETTER(Canceled(&fCanceled)))
+        && fCanceled)
+        return VINF_SUCCESS;
 
     if (RT_FAILURE(rc))
@@ -1097 +1098 @@
                 break;
         }
+
+        BOOL fCanceled = FALSE;
+        if (   SUCCEEDED(mProgress->COMGETTER(Canceled(&fCanceled)))
+            && fCanceled)
+            break;
     }