Changeset 84464 in vbox for trunk/src

Timestamp:

May 22, 2020 3:07:02 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9653: Add and New Cloud VM wizards should handle progress canceling as dialog reject signal.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/wizards

Files:

• addcloudvm/UIWizardAddCloudVMPageBasic1.cpp (modified) (1 diff)
• newcloudvm/UIWizardNewCloudVMPageBasic1.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/addcloudvm/UIWizardAddCloudVMPageBasic1.cpp

@@ -310 +310 @@
             msgCenter().showModalProgressDialog(comProgress, QString(),
                                                 ":/progress_reading_appliance_90px.png", 0, 0);
+            if (comProgress.GetCanceled())
+            {
+                wizardImp()->reject();
+                break;
+            }
             if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
             {

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newcloudvm/UIWizardNewCloudVMPageBasic1.cpp

@@ -327 +327 @@
             /* Show "Acquire cloud images" progress: */
             msgCenter().showModalProgressDialog(comProgress, QString(), ":/progress_reading_appliance_90px.png", 0, 0);
+            if (comProgress.GetCanceled())
+            {
+                wizardImp()->reject();
+                break;
+            }
             if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
             {