Changeset 51079 in vbox

Timestamp:

Apr 15, 2014 3:04:26 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: 7353: UIRuntimeMiniToolBar: Prevent animation crash using manual object-destruction order.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp

@@ -315 +315 @@
     if (m_pHoverLeaveTimer->isActive())
         m_pHoverLeaveTimer->stop();
+
+    /* Destroy animation before mdi-toolbar: */
+    delete m_pAnimation;
+    m_pAnimation = 0;
+
+    /* Destroy mdi-toolbar after animation: */
+    delete m_pEmbeddedToolbar;
+    m_pEmbeddedToolbar = 0;
 }
 
@@ -384 +392 @@
 void UIRuntimeMiniToolBar::setToolbarPosition(QPoint point)
 {
-    /* Make sure toolbar exists: */
-    if (!m_pEmbeddedToolbar)
-        return;
-
     /* Update position: */
+    AssertPtrReturnVoid(m_pEmbeddedToolbar);
     m_pEmbeddedToolbar->move(point);
 
@@ -402 +407 @@
 QPoint UIRuntimeMiniToolBar::toolbarPosition() const
 {
-    /* Make sure toolbar exists: */
-    if (!m_pEmbeddedToolbar)
-        return QPoint();
-
     /* Return position: */
+    AssertPtrReturn(m_pEmbeddedToolbar, QPoint());
     return m_pEmbeddedToolbar->pos();
 }