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

Timestamp:

Apr 30, 2020 10:50:00 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: UICloudNetworkingStuff: Handle progress canceling for few known cases.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• UICloudNetworkingStuff.cpp (modified) (3 diffs)
• UICloudNetworkingStuff.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICloudNetworkingStuff.cpp

@@ -525 +525 @@
                                         strMachineName,
                                         ":/progress_settings_90px.png", pParent, 0);
+    if (comProgress.GetCanceled())
+        return false;
     if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
     {
@@ -553 +555 @@
     /* Wait for "Get settings form" progress: */
     comProgress.WaitForCompletion(-1);
+    if (comProgress.GetCanceled())
+        return false;
     if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
     {
@@ -625 +629 @@
         else
             comProgress.WaitForCompletion(-1);
-        if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
+        if (!comProgress.GetCanceled())
         {
-            if (pParent)
-                msgCenter().cannotAcquireCloudClientParameter(comProgress, pParent);
+            if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
+            {
+                if (pParent)
+                    msgCenter().cannotAcquireCloudClientParameter(comProgress, pParent);
+                else
+                    strErrorMessage = UIErrorString::formatErrorInfo(comProgress);
+            }
             else
-                strErrorMessage = UIErrorString::formatErrorInfo(comProgress);
-        }
-        else
-        {
-            /* Fetch acquired objects to map: */
-            const QVector<QString> instanceIds = comIDs.GetValues();
-            const QVector<QString> instanceNames = comNames.GetValues();
-            QMap<QString, QString> resultMap;
-            for (int i = 0; i < instanceIds.size(); ++i)
-                resultMap[instanceIds.at(i)] = instanceNames.at(i);
-            return resultMap;
+            {
+                /* Fetch acquired objects to map: */
+                const QVector<QString> instanceIds = comIDs.GetValues();
+                const QVector<QString> instanceNames = comNames.GetValues();
+                QMap<QString, QString> resultMap;
+                for (int i = 0; i < instanceIds.size(); ++i)
+                    resultMap[instanceIds.at(i)] = instanceNames.at(i);
+                return resultMap;
+            }
         }
     }

trunk/src/VBox/Frontends/VirtualBox/src/globals/UICloudNetworkingStuff.h

@@ -27 +27 @@
 /* COM includes: */
 #include "COMEnums.h"
+#include "CCloudClient.h"
+#include "CCloudMachine.h"
 #include "CCloudProfile.h"
 #include "CCloudProvider.h"
 #include "CCloudProviderManager.h"
-#include "CCloudClient.h"
-#include "CCloudMachine.h"
 #include "CForm.h"