Changeset 90706 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Aug 17, 2021 5:10:51 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8161: Runtime UI / UIMachineWindow: Cleanup for title update code; Don't touch anything if machine-state is Null (at shutdown).

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp

@@ -571 +571 @@
     if (iElement & UIVisualElement_WindowTitle)
     {
-        /* Get machine state: */
-        KMachineState state = uisession()->machineState();
+        /* Make sure machine state is one of valid: */
+        const KMachineState enmState = uisession()->machineState();
+        if (enmState == KMachineState_Null)
+            return;
+
         /* Prepare full name: */
-        QString strSnapshotName;
+        QString strMachineName = machineName();
+
+        /* Append snapshot name: */
         if (machine().GetSnapshotCount() > 0)
         {
-            CSnapshot snapshot = machine().GetCurrentSnapshot();
-            strSnapshotName = " (" + snapshot.GetName() + ")";
-        }
-        QString strMachineName = machineName() + strSnapshotName;
-        if (state != KMachineState_Null)
-            strMachineName += " [" + gpConverter->toString(state) + "]";
-        /* Unusual on the Mac. */
+            const CSnapshot comSnapshot = machine().GetCurrentSnapshot();
+            strMachineName += " (" + comSnapshot.GetName() + ")";
+        }
+
+        /* Append state name: */
+        strMachineName += " [" + gpConverter->toString(enmState) + "]";
+
 #ifndef VBOX_WS_MAC
+        /* Append user product name (besides macOS): */
         const QString strUserProductName = uisession()->machineWindowNamePostfix();
         strMachineName += " - " + (strUserProductName.isEmpty() ? defaultWindowTitle() : strUserProductName);
 #endif /* !VBOX_WS_MAC */
+
         /* Check if we can get graphics adapter: */
         CGraphicsAdapter comAdapter = machine().GetGraphicsAdapter();
-        if (!machine().isOk())
-        {
-            // What can I say, we really want to notify user about this
-            // one, but if that happens on VM shutdown/poweroff there
-            // will no be a chance to do it, cause application got exited.
-            msgCenter().cannotAcquireMachineParameter(machine());
-        }
-        else
+        if (machine().isOk() && comAdapter.isNotNull())
         {
             /* Append screen number only if there are more than one present: */
@@ -603 +603 @@
                 strMachineName += QString(" : %1").arg(m_uScreenId + 1);
         }
+
+        /* Assign title finally: */
         setWindowTitle(strMachineName);
     }