Changeset 68721 in vbox for trunk

Timestamp:

Sep 12, 2017 11:06:05 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8901: Handle snapshot attribute change errors.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)
• selector/UISnapshotPane.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -946 +946 @@
              .arg(strSnapshotName).arg(strMachineName),
           UIErrorString::formatErrorInfo(progress));
+}
+
+void UIMessageCenter::cannotChangeSnapshot(const CSnapshot &comSnapshot, const QString &strSnapshotName, const QString &strMachineName) const
+{
+    error(0, MessageType_Error,
+          tr("Failed to change the snapshot <b>%1</b> of the virtual machine <b>%2</b>.")
+             .arg(strSnapshotName).arg(strMachineName),
+          UIErrorString::formatErrorInfo(comSnapshot));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h

@@ -212 +212 @@
     void cannotRemoveSnapshot(const CMachine &machine, const QString &strSnapshotName, const QString &strMachineName) const;
     void cannotRemoveSnapshot(const CProgress &progress, const QString &strSnapshotName, const QString &strMachineName) const;
+    void cannotChangeSnapshot(const CSnapshot &comSnapshot, const QString &strSnapshotName, const QString &strMachineName) const;
     void cannotFindSnapshotByName(const CMachine &comMachine, const QString &strName, QWidget *pParent = 0) const;
     void cannotFindSnapshotById(const CMachine &comMachine, const QString &strId, QWidget *pParent = 0) const;

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

@@ -926 +926 @@
 void UISnapshotPane::sltApplySnapshotDetailsChanges()
 {
-    /* Make sure nothing being edited in the meantime: */
-    if (!m_pLockReadWrite->tryLockForWrite())
-        return;
-
-    /* Acquire "current snapshot" item: */
+    /* Acquire selected item: */
     const UISnapshotItem *pSnapshotItem = UISnapshotItem::toSnapshotItem(m_pSnapshotTree->currentItem());
-    AssertPtr(pSnapshotItem);
-    if (pSnapshotItem)
-    {
+    AssertPtrReturnVoid(pSnapshotItem);
+
+    /* For snapshot items: */
+    if (!pSnapshotItem->isCurrentStateItem())
+    {
+        /* Make sure nothing being edited in the meantime: */
+        if (!m_pLockReadWrite->tryLockForWrite())
+            return;
+
         /* Make sure that's a snapshot item indeed: */
         CSnapshot comSnapshot = pSnapshotItem->snapshot();
-        if (comSnapshot.isNotNull())
+        AssertReturnVoid(comSnapshot.isNotNull());
+
+        /* Get item data: */
+        UIDataSnapshot oldData = *pSnapshotItem;
+        UIDataSnapshot newData = m_pDetailsWidget->data();
+        AssertReturnVoid(newData != oldData);
+
+        /* Open a session (this call will handle all errors): */
+        CSession comSession;
+        if (m_enmSessionState != KSessionState_Unlocked)
+            comSession = vboxGlobal().openExistingSession(m_strMachineId);
+        else
+            comSession = vboxGlobal().openSession(m_strMachineId);
+        if (comSession.isNotNull())
         {
-            /* Get item data: */
-            UIDataSnapshot oldData = *pSnapshotItem;
-            UIDataSnapshot newData = m_pDetailsWidget->data();
-
-            /* Update corresponding snapshot attributes if necessary: */
-            if (newData != oldData)
+            /* Get corresponding machine object: */
+            CMachine comMachine = comSession.GetMachine();
+
+            /* Perform separate independent steps: */
+            do
             {
-                /* We need to open a session when we manipulate the snapshot data of a machine: */
-                CSession comSession = vboxGlobal().openExistingSession(comSnapshot.GetMachine().GetId());
-                if (!comSession.isNull())
+                /* Save snapshot name: */
+                if (newData.m_strName != oldData.m_strName)
                 {
-                    // TODO: Add settings save validation.
-
-                    /* Save snapshot name: */
-                    if (newData.m_strName != oldData.m_strName)
-                        comSnapshot.SetName(newData.m_strName);
-                    /* Save snapshot description: */
-                    if (newData.m_strDescription != oldData.m_strDescription)
-                        comSnapshot.SetDescription(newData.m_strDescription);
-
-                    /* Close the session again: */
-                    comSession.UnlockMachine();
+                    comSnapshot.SetName(newData.m_strName);
+                    if (!comSnapshot.isOk())
+                    {
+                        msgCenter().cannotChangeSnapshot(comSnapshot, oldData.m_strName, comMachine.GetName());
+                        break;
+                    }
+                }
+
+                /* Save snapshot description: */
+                if (newData.m_strDescription != oldData.m_strDescription)
+                {
+                    comSnapshot.SetDescription(newData.m_strDescription);
+                    if (!comSnapshot.isOk())
+                    {
+                        msgCenter().cannotChangeSnapshot(comSnapshot, oldData.m_strName, comMachine.GetName());
+                        break;
+                    }
                 }
             }
+            while (0);
+
+            /* Cleanup session: */
+            comSession.UnlockMachine();
         }
-    }
-
-    /* Allows editing again: */
-    m_pLockReadWrite->unlock();
+
+        /* Allows editing again: */
+        m_pLockReadWrite->unlock();
+    }
 
     /* Adjust snapshot tree: */