Changeset 73784 in vbox for trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp

Timestamp:

Aug 20, 2018 11:45:50 AM (7 years ago)

Author:

vboxsync

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

124467

Message:

Main/Appliance: Fix import regression caused by the progress cleanup.

File:

• trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp

@@ -2564 +2564 @@
                     /* Kick off the creation of a dynamic growing disk image with the given capacity. */
                     rc = pTargetMedium->CreateBaseStorage(di.iCapacity / _1M,
-                                                      ComSafeArrayAsInParam(mediumVariant),
-                                                      pProgressImport.asOutParam());
+                                                          ComSafeArrayAsInParam(mediumVariant),
+                                                          pProgressImport.asOutParam());
                     if (FAILED(rc)) throw rc;
 
@@ -2625 +2625 @@
                     ComObjPtr<Medium> nullParent;
                     ComObjPtr<Progress> pProgressImportTmp;
+                    rc = pProgressImportTmp.createObject();
+                    if (FAILED(rc)) throw rc;
+                    rc = pProgressImportTmp->init(mVirtualBox,
+                                                  static_cast<IAppliance*>(this),
+                                                  Utf8StrFmt(tr("Importing medium '%s'"),
+                                                             strAbsDstPath.c_str()),
+                                                  TRUE);
+                    if (FAILED(rc)) throw rc;
+                    pProgressImportTmp.queryInterfaceTo(pProgressImport.asOutParam());
+                    /* pProgressImportTmp is in parameter for Medium::i_importFile,
+                     * which is somewhat unusual and might be changed later. */
                     rc = pTargetMedium->i_importFile(strSrcFilePath.c_str(),
                                                      srcFormat,
@@ -2631 +2642 @@
                                                      nullParent,
                                                      pProgressImportTmp);
-                    pProgressImportTmp.queryInterfaceTo(pProgressImport.asOutParam());
                     RTVfsIoStrmRelease(hVfsIosReadAhead);
                     hVfsIosSrc = NIL_RTVFSIOSTREAM;