Changeset 67275 in vbox for trunk

Timestamp:

Jun 6, 2017 2:26:42 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: Selector UI: Tools pane: Snapshot pane: Fixing race causing assertion on session state change related to snapshot being deleted.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector

Files:

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

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISnapshotPane.cpp

@@ -618 +618 @@
     /* Recache current session-state: */
     m_enmSessionState = enmState;
-    sltHandleCurrentItemChange();
+
+    /* Update action states: */
+    updateActionStates();
 }
 
@@ -715 +717 @@
     const UISnapshotItem *pSnapshotItem = UISnapshotItem::toSnapshotItem(m_pSnapshotTree->currentItem());
 
-    /* Make the selected item visible: */
+    /* Make the current item visible: */
     if (pSnapshotItem)
     {
@@ -723 +725 @@
     }
 
-    /* Check whether another direct session is open or not: */
-    const bool fBusy = m_enmSessionState != KSessionState_Unlocked;
-
-    /* Acquire machine state of the "current state" item: */
-    KMachineState enmState = KMachineState_Null;
-    if (currentStateItem())
-        enmState = currentStateItem()->machineState();
-
-    /* Whether taking or deleting snapshots is possible right now: */
-    const bool fCanTakeDeleteSnapshot =    !fBusy
-                                        || enmState == KMachineState_PoweredOff
-                                        || enmState == KMachineState_Saved
-                                        || enmState == KMachineState_Aborted
-                                        || enmState == KMachineState_Running
-                                        || enmState == KMachineState_Paused;
-
-    /* Enable/disable snapshot operations: */
-    m_pActionTakeSnapshot->setEnabled(
-           m_fShapshotOperationsAllowed
-        && (   (   fCanTakeDeleteSnapshot
-                && m_pCurrentSnapshotItem
-                && pSnapshotItem
-                && pSnapshotItem->isCurrentStateItem())
-            || (   pSnapshotItem
-                && !m_pCurrentSnapshotItem))
-    );
-    m_pActionDeleteSnapshot->setEnabled(
-           m_fShapshotOperationsAllowed
-        && fCanTakeDeleteSnapshot
-        && m_pCurrentSnapshotItem
-        && pSnapshotItem
-        && !pSnapshotItem->isCurrentStateItem()
-    );
-    m_pActionRestoreSnapshot->setEnabled(
-           !fBusy
-        && m_pCurrentSnapshotItem
-        && pSnapshotItem
-        && !pSnapshotItem->isCurrentStateItem()
-    );
-    m_pActionShowSnapshotDetails->setEnabled(
-        pSnapshotItem
-    );
-    m_pActionCommitSnapshotDetails->setEnabled(
-        false
-    );
-    m_pActionCloneSnapshot->setEnabled(
-           pSnapshotItem
-        && (   !pSnapshotItem->isCurrentStateItem()
-            || !fBusy)
-    );
-
-    /* If there is a proper snasphot item: */
-    if (pSnapshotItem)
-    {
-        /* Update details-widget if it's visible: */
-        if (m_pDetailsWidget->isVisible())
-            m_pDetailsWidget->setData(*pSnapshotItem, pSnapshotItem->snapshot());
-    }
+    /* Update action states: */
+    updateActionStates();
+
+    /* Update details-widget if it's visible: */
+    if (pSnapshotItem && m_pDetailsWidget->isVisible())
+        m_pDetailsWidget->setData(*pSnapshotItem, pSnapshotItem->snapshot());
 }
 
@@ -1069 +1019 @@
     QWriteLocker locker(m_pLockReadWrite);
 
-    /* If VM is null, just updated the current itm: */
+    /* If VM is null, just updated the current item: */
     if (m_comMachine.isNull())
     {
@@ -1182 +1132 @@
     delete m_pLockReadWrite;
     m_pLockReadWrite = 0;
+}
+
+void UISnapshotPane::updateActionStates()
+{
+    /* Acquire current snapshot item: */
+    const UISnapshotItem *pSnapshotItem = UISnapshotItem::toSnapshotItem(m_pSnapshotTree->currentItem());
+
+    /* Check whether another direct session is opened: */
+    const bool fBusy = m_enmSessionState != KSessionState_Unlocked;
+
+    /* Acquire machine-state of the "current state" item: */
+    KMachineState enmState = KMachineState_Null;
+    if (currentStateItem())
+        enmState = currentStateItem()->machineState();
+
+    /* Determine whether taking or deleting snapshots is possible: */
+    const bool fCanTakeDeleteSnapshot =    !fBusy
+                                        || enmState == KMachineState_PoweredOff
+                                        || enmState == KMachineState_Saved
+                                        || enmState == KMachineState_Aborted
+                                        || enmState == KMachineState_Running
+                                        || enmState == KMachineState_Paused;
+
+    /* Update 'Take' action: */
+    m_pActionTakeSnapshot->setEnabled(
+           m_fShapshotOperationsAllowed
+        && (   (   fCanTakeDeleteSnapshot
+                && m_pCurrentSnapshotItem
+                && pSnapshotItem
+                && pSnapshotItem->isCurrentStateItem())
+            || (   pSnapshotItem
+                && !m_pCurrentSnapshotItem))
+    );
+
+    /* Update 'Delete' action: */
+    m_pActionDeleteSnapshot->setEnabled(
+           m_fShapshotOperationsAllowed
+        && fCanTakeDeleteSnapshot
+        && m_pCurrentSnapshotItem
+        && pSnapshotItem
+        && !pSnapshotItem->isCurrentStateItem()
+    );
+
+    /* Update 'Restore' action: */
+    m_pActionRestoreSnapshot->setEnabled(
+           !fBusy
+        && m_pCurrentSnapshotItem
+        && pSnapshotItem
+        && !pSnapshotItem->isCurrentStateItem()
+    );
+
+    /* Update 'Show Details' action: */
+    m_pActionShowSnapshotDetails->setEnabled(
+        pSnapshotItem
+    );
+
+    /* Update 'Commit Details' action: */
+    m_pActionCommitSnapshotDetails->setEnabled(
+        false
+    );
+
+    /* Update 'Clone' action: */
+    m_pActionCloneSnapshot->setEnabled(
+           pSnapshotItem
+        && (   !pSnapshotItem->isCurrentStateItem()
+            || !fBusy)
+    );
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISnapshotPane.h

@@ -153 +153 @@
     /** @name Toolbar helpers.
       * @{ */
+        /** Updates action states. */
+        void updateActionStates();
+
         /** Proposes to take a snapshot. */
         bool takeSnapshot();