Changeset 66942 in vbox for trunk/src/VBox

Timestamp:

May 17, 2017 6:07:51 PM (8 years ago)

Author:

vboxsync

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

115474

Message:

Main/Machine: fix parallel port settings loading, which suffers from a difference between settings default and the desired API default (making the 2nd LPT show up with the default port/irq from the settings code).

File:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -9110 +9110 @@
         }
 
-        // serial ports
+        // serial ports (establish defaults first, to ensure reading the same
+        // settings as we saved, since the list skips ports having defaults)
+        for (unsigned i = 0; i < RT_ELEMENTS(mSerialPorts); i++)
+            mSerialPorts[i]->i_applyDefaults(pGuestOSType);
         for (settings::SerialPortsList::const_iterator
              it = data.llSerialPorts.begin();
@@ -9123 +9126 @@
         }
 
-        // parallel ports (optional)
+        // parallel ports (establish defaults first, to ensure reading the same
+        // settings as we saved, since the list skips ports having defaults)
+        for (unsigned i = 0; i < RT_ELEMENTS(mParallelPorts); i++)
+            mParallelPorts[i]->i_applyDefaults();
         for (settings::ParallelPortsList::const_iterator
              it = data.llParallelPorts.begin();