Changeset 46734 in vbox

Timestamp:

Jun 22, 2013 7:39:58 PM (12 years ago)

Author:

vboxsync

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

86657

Message:

Main: Don't create a medium lock list if there is no medium to attach during hotplug (empty DVD drive)

File:

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

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

@@ -4517 +4517 @@
     if (fHotplug || fSilent)
     {
-        MediumLockList *pMediumLockList(new MediumLockList());
-
-        rc = medium->createMediumLockList(true /* fFailIfInaccessible */,
-                                          true /* fMediumLockWrite */,
-                                          NULL,
-                                          *pMediumLockList);
-        alock.acquire();
-        if (FAILED(rc))
-            delete pMediumLockList;
-        else
-        {
-            mData->mSession.mLockedMedia.Unlock();
+        if (!medium.isNull())
+        {
+            MediumLockList *pMediumLockList(new MediumLockList());
+
+            rc = medium->createMediumLockList(true /* fFailIfInaccessible */,
+                                              true /* fMediumLockWrite */,
+                                              NULL,
+                                              *pMediumLockList);
+            alock.acquire();
+            if (FAILED(rc))
+                delete pMediumLockList;
+            else
+            {
+                mData->mSession.mLockedMedia.Unlock();
+                alock.release();
+                rc = mData->mSession.mLockedMedia.Insert(attachment, pMediumLockList);
+                mData->mSession.mLockedMedia.Lock();
+                alock.acquire();
+            }
             alock.release();
-            rc = mData->mSession.mLockedMedia.Insert(attachment, pMediumLockList);
-            mData->mSession.mLockedMedia.Lock();
-            alock.acquire();
-        }
-        alock.release();
+        }
 
         if (SUCCEEDED(rc))