Changeset 36682 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Apr 15, 2011 11:22:33 AM (14 years ago)

Author:

vboxsync

Message:

Main/Machine: fix formatting of progress description, and minor cleanup

File:

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

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

@@ -3227 +3227 @@
                                       IProgress **aProgress)
 {
+    CheckComArgStrNotEmptyOrNull(aType);
     Utf8Str strType(aType);
     Utf8Str strEnvironment(aEnvironment);
-
     /* "emergencystop" doesn't need the session, so skip the checks/interface
      * retrieval. This code doesn't quite fit in here, but introducing a
@@ -3236 +3236 @@
     if (strType != "emergencystop")
         CheckComArgNotNull(aSession);
-    CheckComArgStrNotEmptyOrNull(aType);
     CheckComArgOutPointerValid(aProgress);
 
@@ -3277 +3276 @@
         rc = progress->init(mParent,
                             static_cast<IMachine*>(this),
-                            BstrFmt(tr("Starting VM \"%s\" (%s)"), aType).raw(),
+                            BstrFmt(tr("Starting VM \"%s\" (%s)"), mUserData->s.strName.c_str(), strType.c_str()).raw(),
                             TRUE /* aCancelable */,
                             fTeleporterEnabled ? 20 : 10 /* uTotalOperationsWeight */,