Changeset 90685 in vbox for trunk

Timestamp:

Aug 13, 2021 4:32:18 PM (3 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8161: Runtime UI / Normal mode: A bit of paranoia and sanity checks as well as proper cleanup stuff for status-bar indicator-pool; This is necessary now since COM can be deinitialized early.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal

Files:

• UIMachineWindowNormal.cpp (modified) (5 diffs)
• UIMachineWindowNormal.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

@@ -191 +191 @@
     statusBar()->setVisible(pActionStatusBarSwitch->isChecked());
     /* Update status-bar indicators-pool: */
-    m_pIndicatorsPool->setAutoUpdateIndicatorStates(statusBar()->isVisible() && uisession()->isRunning());
+    if (m_pIndicatorsPool)
+        m_pIndicatorsPool->setAutoUpdateIndicatorStates(statusBar()->isVisible() && uisession()->isRunning());
 
     /* Normalize geometry without moving: */
@@ -206 +207 @@
 void UIMachineWindowNormal::sltHandleIndicatorContextMenuRequest(IndicatorType enmIndicatorType, const QPoint &indicatorPosition)
 {
+    /* Sanity check, this slot should be called if m_pIndicatorsPool present anyway: */
+    AssertPtrReturnVoid(m_pIndicatorsPool);
     /* Determine action depending on indicator-type: */
     UIAction *pAction = 0;
@@ -374 +377 @@
         /* Update status-bar visibility: */
         statusBar()->setVisible(actionPool()->action(UIActionIndexRT_M_View_M_StatusBar_T_Visibility)->isChecked());
-        m_pIndicatorsPool->setAutoUpdateIndicatorStates(statusBar()->isVisible() && uisession()->isRunning());
+        if (m_pIndicatorsPool)
+            m_pIndicatorsPool->setAutoUpdateIndicatorStates(statusBar()->isVisible() && uisession()->isRunning());
     }
 
@@ -435 +439 @@
     if (gpNotificationCenter && (gpNotificationCenter->parent() == centralWidget()))
         gpNotificationCenter->setParent(0);
+}
+
+void UIMachineWindowNormal::cleanupStatusBar()
+{
+    delete m_pIndicatorsPool;
+    m_pIndicatorsPool = 0;
 }
 
@@ -634 +644 @@
 
     /* Set status-bar indicator-pool auto update timer: */
-    if (iElement & UIVisualElement_IndicatorPoolStuff)
+    if (   m_pIndicatorsPool
+        && iElement & UIVisualElement_IndicatorPoolStuff)
         m_pIndicatorsPool->setAutoUpdateIndicatorStates(statusBar()->isVisible() && uisession()->isRunning());
     /* Update status-bar indicator-pool appearance only when status-bar is visible: */
-    if (statusBar()->isVisible())
+    if (   m_pIndicatorsPool
+        && statusBar()->isVisible())
     {
         /* If VM is running: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.h

@@ -109 +109 @@
     /** Cleanup notification-center routine. */
     void cleanupNotificationCenter();
+    /** Cleanup status-bar routine. */
+    void cleanupStatusBar();
     /** Cleanup session connections routine. */
     void cleanupSessionConnections();