Changeset 55244 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 14, 2015 12:57:40 PM (10 years ago)

Author:

vboxsync

Message:

Main: Fixed DnD progress object creation; don't allow cancellation of transfers (yet).

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestDnDPrivate.cpp (modified) (1 diff)
• GuestDnDTargetImpl.cpp (modified) (1 diff)

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

@@ -282 +282 @@
         rc = m_progress->init(static_cast<IGuest*>(pParent),
                               Bstr(pParent->tr("Dropping data")).raw(),
-                              TRUE);
+                              FALSE /* fCancelable */);
     }
     return rc;

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

@@ -432 +432 @@
         if (RT_SUCCESS(rc))
         {
-            /* Query the progress object to the caller. */
-            if (aProgress)
-                pResp->queryProgressTo(aProgress.asOutParam());
+            hr = pResp->queryProgressTo(aProgress.asOutParam());
+            ComAssertComRC(hr);
         }
     }