Changeset 46416 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jun 6, 2013 2:29:04 PM (12 years ago)

Author:

vboxsync

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

86248

Message:

FE/Qt: VM settings: Display page: Overall cleanup (part 4): Little changes to settings-save procedure.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp

@@ -195 +195 @@
     UISettingsPageMachine::fetchData(data);
 
-    /* Check if display data was changed: */
-    if (m_cache.wasChanged())
+    /* Make sure machine is in valid mode & display data was changed: */
+    if (isMachineInValidMode() && m_cache.wasChanged())
     {
         /* Get display data from cache: */
         const UIDataSettingsMachineDisplay &displayData = m_cache.data();
 
-        /* Store Video data: */
+        /* Make sure machine is 'offline': */
         if (isMachineOffline())
         {
-            /* Video tab: */
+            /* Store Video data: */
             m_machine.SetVRAMSize(displayData.m_iCurrentVRAM);
             m_machine.SetMonitorCount(displayData.m_cGuestScreenCount);
@@ -218 +218 @@
         {
             /* Store Remote Display data: */
-            if (isMachineInValidMode())
-            {
-                remoteDisplayServer.SetEnabled(displayData.m_fRemoteDisplayServerEnabled);
-                remoteDisplayServer.SetVRDEProperty("TCP/Ports", displayData.m_strRemoteDisplayPort);
-                remoteDisplayServer.SetAuthType(displayData.m_remoteDisplayAuthType);
-                remoteDisplayServer.SetAuthTimeout(displayData.m_uRemoteDisplayTimeout);
-            }
+            remoteDisplayServer.SetEnabled(displayData.m_fRemoteDisplayServerEnabled);
+            remoteDisplayServer.SetVRDEProperty("TCP/Ports", displayData.m_strRemoteDisplayPort);
+            remoteDisplayServer.SetAuthType(displayData.m_remoteDisplayAuthType);
+            remoteDisplayServer.SetAuthTimeout(displayData.m_uRemoteDisplayTimeout);
+            /* Make sure machine is 'offline' or 'saved': */
             if (isMachineOffline() || isMachineSaved())
-            {
                 remoteDisplayServer.SetAllowMultiConnection(displayData.m_fRemoteDisplayMultiConnAllowed);
-            }
         }
     }