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

Timestamp:

Nov 22, 2010 3:48:33 PM (14 years ago)

Author:

vboxsync

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

68002

Message:

Guest Additions Update/Main+Fe/Qt4: Don't show errors (also don't in log) when old Guest Additions can't be updated automatically or when Guest Additions are not installed on guest - just use the "old" .ISO mounting approach.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp (modified) (2 diffs)

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

@@ -372 +372 @@
     {
         vboxProblem().showModalProgressDialog(progressInstall, tr("Install"),
-                                              mainMachineWindow(), 0 /* No delay */);
+                                              mainMachineWindow(), 500 /* 500ms delay. */);
         if (progressInstall.GetCanceled())
             return;
@@ -382 +382 @@
              * simply isn't supported yet), so silently fall back to "old" .ISO
              * mounting method. */
-            if (rc != VBOX_E_NOT_SUPPORTED)
+            if (   !SUCCEEDED_WARNING(rc)
+                && rc != VBOX_E_NOT_SUPPORTED)
+            {
                 vboxProblem().cannotUpdateGuestAdditions(progressInstall, mainMachineWindow());
 
-            /* In every case we log the error message in the release log. */
-            QString strErr = progressInstall.GetErrorInfo().GetText();
-            if (!strErr.isEmpty())
-                LogRel(("%s\n", strErr.toLatin1().constData()));
+                /* Log the error message in the release log. */
+                QString strErr = progressInstall.GetErrorInfo().GetText();
+                if (!strErr.isEmpty())
+                    LogRel(("%s\n", strErr.toLatin1().constData()));
+            }
             fDoMount = true; /* Since automatic updating failed, fall back to .ISO mounting. */
         }