Changeset 52999 in vbox for trunk

Timestamp:

Oct 8, 2014 4:24:26 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI rework/cleanup for 7115 (part #8): UISession prepare/cleanup stuff maintenance.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp (modified) (6 diffs)

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

@@ -1027 +1027 @@
     /* Create action-pool: */
     m_pActionPool = UIActionPool::create(UIActionPoolType_Runtime);
-    m_pActionPool->toRuntime()->setSession(this);
+    AssertPtrReturnVoid(actionPool());
+    {
+        /* Configure action-pool: */
+        actionPool()->toRuntime()->setSession(this);
 
         /* Get host/machine: */
@@ -1109 +1112 @@
         }
 #endif /* Q_WS_MAC */
+    }
 }
 
@@ -1258 +1262 @@
 
         /* Remember if guest should autoresize: */
-        gEDataManager->setGuestScreenAutoResizeEnabled(actionPool()->action(UIActionIndexRT_M_View_T_GuestAutoresize)->isChecked(), vboxGlobal().managedVMUuid());
+        if (actionPool())
+        {
+            const QAction *pGuestAutoresizeSwitch = actionPool()->action(UIActionIndexRT_M_View_T_GuestAutoresize);
+            gEDataManager->setGuestScreenAutoResizeEnabled(pGuestAutoresizeSwitch->isChecked(), vboxGlobal().managedVMUuid());
+        }
 
 #ifndef Q_WS_MAC
@@ -1273 +1281 @@
     for (int i = m_frameBufferVector.size() - 1; i >= 0; --i)
     {
-        UIFrameBuffer *pFb = m_frameBufferVector[i];
-        if (pFb)
+        UIFrameBuffer *pFrameBuffer = m_frameBufferVector[i];
+        if (pFrameBuffer)
         {
             /* Mark framebuffer as unused: */
-            pFb->setMarkAsUnused(true);
+            pFrameBuffer->setMarkAsUnused(true);
             /* Detach framebuffer from Display: */
             CDisplay display = session().GetConsole().GetDisplay();
@@ -1291 +1299 @@
 void UISession::cleanupConsoleEventHandlers()
 {
-    /* Destroy console event-handler: */
+    /* Destroy console event-handler if necessary: */
+    if (gConsoleEvents)
         UIConsoleEventHandler::destroy();
 }
@@ -1306 +1315 @@
 {
 #ifdef Q_WS_MAC
+    /* Destroy Mac OS X menu-bar: */
     delete m_pMenuBar;
     m_pMenuBar = 0;
 #endif /* Q_WS_MAC */
 
-    /* Destroy action-pool: */
-    UIActionPool::destroy(m_pActionPool);
+    /* Destroy action-pool if necessary: */
+    if (actionPool())
+        UIActionPool::destroy(actionPool());
 }