Changeset 89222 in vbox for trunk

Timestamp:

May 21, 2021 12:50:09 PM (4 years ago)

Author:

vboxsync

Message:

FE/VBoxHeadless: Give the VM name in the shutdown block reason and
make the message more succint and less scary ("saving" instead of
technically correct but less informative "terminating"). bugref:8161.

File:

• trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -79 +79 @@
 static IConsole *gConsole = NULL;
 static NativeEventQueue *gEventQ = NULL;
+
+/* keep this handy for messages */
+static com::Utf8Str g_strVMName;
+static com::Utf8Str g_strVMUUID;
 
 /* flag whether frontend should terminate */
@@ -888 +892 @@
 
             /* tell the user what we are doing */
-            ::ShutdownBlockReasonCreate(hwnd, L"Waiting for VM to terminate");
+            ::ShutdownBlockReasonCreate(hwnd,
+                com::BstrFmt("%s saving state",
+                             g_strVMName.c_str()).raw());
 
             /* tell the VM to save state/power off */
@@ -1377 +1383 @@
         }
 
-        Bstr id;
-        rc = m->COMGETTER(Id)(id.asOutParam());
+        Bstr bstrVMId;
+        rc = m->COMGETTER(Id)(bstrVMId.asOutParam());
         AssertComRC(rc);
         if (FAILED(rc))
             break;
+        g_strVMUUID = bstrVMId;
+
+        Bstr bstrVMName;
+        rc = m->COMGETTER(Name)(bstrVMName.asOutParam());
+        AssertComRC(rc);
+        if (FAILED(rc))
+            break;
+        g_strVMName = bstrVMName;
 
         Log(("VBoxHeadless: Opening a session with machine (id={%s})...\n",
-              Utf8Str(id).c_str()));
+             g_strVMUUID.c_str()));
 
         // set session name