Changeset 100635 in vbox

Timestamp:

Jul 18, 2023 3:17:36 PM (17 months ago)

Author:

vboxsync

Message:

FE/Qt: VM Settings: Make sure VRDE tab of Display page isn't available if no ExtPack exist and usable.

File:

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

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

@@ -399 +399 @@
 
     /* Check whether remote display server is valid: */
-    const CVRDEServer &vrdeServer = m_machine.GetVRDEServer();
-    oldDisplayData.m_fRemoteDisplayServerSupported = !vrdeServer.isNull();
-    if (!vrdeServer.isNull())
+    CExtPackManager comExtPackManager = uiCommon().virtualBox().GetExtensionPackManager();
+    const bool fExtPackPresent = comExtPackManager.isNotNull() && comExtPackManager.IsExtPackUsable(GUI_ExtPackName);
+    CVRDEServer comVrdeServer = m_machine.GetVRDEServer();
+    const bool fServerExists = m_machine.isOk() && comVrdeServer.isNotNull();
+    oldDisplayData.m_fRemoteDisplayServerSupported = fExtPackPresent && fServerExists;
+    if (oldDisplayData.m_fRemoteDisplayServerSupported)
     {
         /* Gather old 'Remote Display' data: */
-        oldDisplayData.m_fRemoteDisplayServerEnabled = vrdeServer.GetEnabled();
-        oldDisplayData.m_strRemoteDisplayPort = vrdeServer.GetVRDEProperty("TCP/Ports");
-        oldDisplayData.m_remoteDisplayAuthType = vrdeServer.GetAuthType();
-        oldDisplayData.m_uRemoteDisplayTimeout = vrdeServer.GetAuthTimeout();
-        oldDisplayData.m_fRemoteDisplayMultiConnAllowed = vrdeServer.GetAllowMultiConnection();
+        oldDisplayData.m_fRemoteDisplayServerEnabled = comVrdeServer.GetEnabled();
+        oldDisplayData.m_strRemoteDisplayPort = comVrdeServer.GetVRDEProperty("TCP/Ports");
+        oldDisplayData.m_remoteDisplayAuthType = comVrdeServer.GetAuthType();
+        oldDisplayData.m_uRemoteDisplayTimeout = comVrdeServer.GetAuthTimeout();
+        oldDisplayData.m_fRemoteDisplayMultiConnAllowed = comVrdeServer.GetAllowMultiConnection();
     }
 
@@ -687 +690 @@
 
     /* Remote Display tab: */
+    if (m_pTabWidget->isTabEnabled(1))
     {
         /* Prepare message: */
@@ -1127 +1131 @@
         /* Get new data from cache: */
         const UIDataSettingsMachineDisplay &newDisplayData = m_pCache->data();
+
+        /* Do not save anything if server isn't supported: */
+        if (   !oldDisplayData.m_fRemoteDisplayServerSupported
+            || !newDisplayData.m_fRemoteDisplayServerSupported)
+            return fSuccess;
 
         /* Get remote display server for further activities: */