Changeset 66375 in vbox

Timestamp:

Mar 31, 2017 10:33:00 AM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: Machine settings: Fixing crash regressions of r114300, r114308, r114309.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine

Files:

• UIMachineSettingsNetwork.cpp (modified) (1 diff)
• UIMachineSettingsParallel.cpp (modified) (1 diff)
• UIMachineSettingsSerial.cpp (modified) (1 diff)

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

@@ -1299 +1299 @@
         m_pTabWidget->setTabEnabled(iSlot,
                                     isMachineOffline() ||
-                                    (isMachineInValidMode() && m_pCache->base().m_adapters.at(iSlot).m_fAdapterEnabled));
+                                    (isMachineInValidMode() &&
+                                     m_pCache->base().m_adapters.size() > iSlot &&
+                                     m_pCache->base().m_adapters.at(iSlot).m_fAdapterEnabled));
         UIMachineSettingsNetwork *pTab = qobject_cast<UIMachineSettingsNetwork*>(m_pTabWidget->widget(iSlot));
         pTab->polishTab();

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

@@ -536 +536 @@
         m_pTabWidget->setTabEnabled(iPort,
                                     isMachineOffline() ||
-                                    (isMachineInValidMode() && m_pCache->base().m_ports.at(iPort).m_fPortEnabled));
+                                    (isMachineInValidMode() &&
+                                     m_pCache->base().m_ports.size() > iPort &&
+                                     m_pCache->base().m_ports.at(iPort).m_fPortEnabled));
         UIMachineSettingsParallel *pTab = qobject_cast<UIMachineSettingsParallel*>(m_pTabWidget->widget(iPort));
         pTab->polishTab();

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

@@ -603 +603 @@
         m_pTabWidget->setTabEnabled(iPort,
                                     isMachineOffline() ||
-                                    (isMachineInValidMode() && m_pCache->base().m_ports.at(iPort).m_fPortEnabled));
+                                    (isMachineInValidMode() &&
+                                     m_pCache->base().m_ports.size() > iPort &&
+                                     m_pCache->base().m_ports.at(iPort).m_fPortEnabled));
         UIMachineSettingsSerial *pTab = qobject_cast<UIMachineSettingsSerial*>(m_pTabWidget->widget(iPort));
         pTab->polishTab();