Changeset 79936 in vbox

Timestamp:

Jul 23, 2019 4:56:43 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

132357

Message:

FE/Qt: bugref:7720: Rework UIMachineAttributeSetter::setMachineAttribute to be more versatile.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMachineAttributeSetter.cpp (modified) (1 diff)

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

@@ -36 +36 @@
     do
     {
+        /* Save machine settings? */
+        bool fSaveSettings = true;
+        /* Error happened? */
+        bool fErrorHappened = false;
+
         /* Assign attribute depending on passed type: */
         switch (enmType)
         {
-            case MachineAttribute_Name: comMachine.SetName(guiAttribute.toString()); break;
-            case MachineAttribute_OSType: comMachine.SetOSTypeId(guiAttribute.toString()); break;
-            default: break;
+            case MachineAttribute_Name:
+            {
+                /* Change machine name: */
+                comMachine.SetName(guiAttribute.toString());
+                if (!comMachine.isOk())
+                {
+                    msgCenter().cannotChangeMachineAttribute(comMachine);
+                    fErrorHappened = true;
+                }
+                break;
+            }
+            case MachineAttribute_OSType:
+            {
+                /* Change machine OS type: */
+                comMachine.SetOSTypeId(guiAttribute.toString());
+                if (!comMachine.isOk())
+                {
+                    msgCenter().cannotChangeMachineAttribute(comMachine);
+                    fErrorHappened = true;
+                }
+                break;
+            }
+            default:
+                break;
         }
-        /* Change machine name: */
-        if (!comMachine.isOk())
-        {
-            msgCenter().cannotChangeMachineAttribute(comMachine);
+
+        /* Error happened? */
+        if (fErrorHappened)
             break;
-        }
+        /* Save machine settings? */
+        if (!fSaveSettings)
+            break;
 
         /* Save machine settings: */