Changeset 34398 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 26, 2010 4:24:58 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

68169

Message:

Guest Additions update: Don't wait when showing modal progress dialog in GUI.

Location:

trunk/src/VBox/Frontends

Files:

• VBoxManage/VBoxManageGuestCtrl.cpp (modified) (1 diff)
• VirtualBox/src/runtime/UISession.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp

@@ -1450 +1450 @@
             ComPtr<IProgress> progress;
             CHECK_ERROR(guest, UpdateGuestAdditions(Bstr(Utf8Source).raw(),
-                                                    0 /* Flags, not used. */,
+                                                    AdditionsUpdateFlag_None,
                                                     progress.asOutParam()));
             if (FAILED(rc))

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -364 +364 @@
     CGuest guest = session().GetConsole().GetGuest();
 #ifdef DEBUG_andy
-    CProgress progressInstall = guest.UpdateGuestAdditions("c:\\Downloads\\VBoxGuestAdditions_3.2.8.iso", 0);
+    CProgress progressInstall = guest.UpdateGuestAdditions("c:\\Downloads\\VBoxGuestAdditions_3.2.8.iso",
+                                                           AdditionsUpdateFlag_WaitForUpdateStartOnly);
 #else
-    CProgress progressInstall = guest.UpdateGuestAdditions(strSource, 0 /* Flags, not used. */);
+    /* Since we are going to show a modal progress dialog we don't want to wait for the whole
+     * update progress being complete - the user might need to interact with the VM to confirm (WHQL)
+     * popups - instead we only wait until the actual update process was started. */
+    CProgress progressInstall = guest.UpdateGuestAdditions(strSource,
+                                                           AdditionsUpdateFlag_WaitForUpdateStartOnly);
 #endif
     bool fResult = guest.isOk();