Changeset 66483 in vbox for trunk/src/VBox/Main/src-server/MachineImpl.cpp

Timestamp:

Apr 7, 2017 5:40:54 PM (8 years ago)

Author:

vboxsync

Message:

Main/Machine: fix the operation count handling for IMachine.deleteConfig - it was subtly broken for a long time (showing wrong sub-operation messages) and just halfway working, and recently this inconsistency resulted in a logical bug which exposed the mess

File:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (modified) (2 diffs)

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

@@ -5356 +5356 @@
                 if (FAILED(mac.rc())) throw mac.rc();
                 Utf8Str strLocation = pMedium->i_getLocationFull();
+                LogFunc(("Deleting file %s\n", strLocation.c_str()));
                 rc = task.m_pProgress->SetNextOperation(BstrFmt(tr("Deleting '%s'"), strLocation.c_str()).raw(), 1);
                 if (FAILED(rc)) throw rc;
-                LogFunc(("Deleting file %s\n", strLocation.c_str()));
             }
             if (pMedium->i_isMediumFormatFile())
@@ -5526 +5526 @@
                          Bstr(tr("Deleting files")).raw(),
                          true /* fCancellable */,
-                         (ULONG)(llFilesToDelete.size() + llMediums.size() + 1),   // cOperations
-                         BstrFmt(tr("Deleting '%s'"), llFilesToDelete.front().c_str()).raw());
+                         (ULONG)(1 + llMediums.size() + llFilesToDelete.size() + 1),    // cOperations
+                         Bstr(tr("Collecting file inventory")).raw());
     if (FAILED(rc))
         return rc;