Changeset 60644 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 22, 2016 11:36:25 AM (9 years ago)

Author:

vboxsync

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

106810

Message:

Main/Machine: fix restoring snapshots which have more network adapters than the current state (happens when the snapshot uses ICH9 and the current state PIIX3)

File:

• trunk/src/VBox/Main/src-server/MachineImpl.cpp (modified) (1 diff)

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

@@ -12125 +12125 @@
     mNetworkAdapters.resize(aThat->mNetworkAdapters.size());
     for (ULONG slot = 0; slot < mNetworkAdapters.size(); ++slot)
-        mNetworkAdapters[slot]->i_copyFrom(aThat->mNetworkAdapters[slot]);
+    {
+        if (mNetworkAdapters[slot].isNotNull())
+            mNetworkAdapters[slot]->i_copyFrom(aThat->mNetworkAdapters[slot]);
+        else
+        {
+            unconst(mNetworkAdapters[slot]).createObject();
+            mNetworkAdapters[slot]->initCopy(this, aThat->mNetworkAdapters[slot]);
+        }
+    }
     for (ULONG slot = 0; slot < RT_ELEMENTS(mSerialPorts); ++slot)
         mSerialPorts[slot]->i_copyFrom(aThat->mSerialPorts[slot]);