Changeset 37698 in vbox for trunk

Timestamp:

Jun 29, 2011 7:21:50 PM (13 years ago)

Author:

vboxsync

Message:

Main/Console: don't unmount the drive on eject if this is a host drive

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -9533 +9533 @@
         if (!pMediumAtt.isNull())
         {
-            alock.release();
-
-            ComPtr<IMediumAttachment> pNewMediumAtt;
-            HRESULT rc = pData->pConsole->mControl->EjectMedium(pMediumAtt, pNewMediumAtt.asOutParam());
-            if (SUCCEEDED(rc))
-                fireMediumChangedEvent(pData->pConsole->mEventSource, pNewMediumAtt);
-
-            alock.acquire();
-            if (pNewMediumAtt != pMediumAtt)
+            IMedium *pMedium;
+            HRESULT rc = pMediumAtt->COMGETTER(Medium)(&pMedium);
+            AssertComRC(rc);
+            BOOL fHostDrive = FALSE;
+            rc = pMedium->COMGETTER(HostDrive)(&fHostDrive);
+            AssertComRC(rc);
+            if (!fHostDrive)
             {
-                pData->pmapMediumAttachments->erase(devicePath);
-                pData->pmapMediumAttachments->insert(std::make_pair(devicePath, pNewMediumAtt));
+                alock.release();
+
+                ComPtr<IMediumAttachment> pNewMediumAtt;
+                rc = pData->pConsole->mControl->EjectMedium(pMediumAtt, pNewMediumAtt.asOutParam());
+                if (SUCCEEDED(rc))
+                    fireMediumChangedEvent(pData->pConsole->mEventSource, pNewMediumAtt);
+
+                alock.acquire();
+                if (pNewMediumAtt != pMediumAtt)
+                {
+                    pData->pmapMediumAttachments->erase(devicePath);
+                    pData->pmapMediumAttachments->insert(std::make_pair(devicePath, pNewMediumAtt));
+                }
             }
         }