Changeset 102928 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jan 17, 2024 3:03:04 PM (11 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699. Use the old way of populating drive letters in case IGuestSession::getMountPoints throws and error.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.cpp

@@ -996 +996 @@
         return;
 
-    /** @todo Currently API lacks a way to query windows drive letters.
-     *  so we enumarate them by using CGuestSession::DirectoryExists() */
     m_driveLetterList.clear();
-#if 0
-    for (int i = 'A'; i <= 'Z'; ++i)
-    {
-        QString path((char)i);
-        path += ":/";
-        bool exists = m_comGuestSession.DirectoryExists(path, false /* aFollowSymlinks */);
-        if (exists)
-            m_driveLetterList.push_back(path);
-    }
-#endif
 
     QVector<QString> mountPoints = m_comGuestSession.GetMountPoints();
-    foreach (const QString &strPoint, mountPoints)
-        m_driveLetterList.push_back(UIPathOperations::replaceDosDelimeter(strPoint));
+    if (m_comGuestSession.isOk())
+    {
+        foreach (const QString &strPoint, mountPoints)
+            m_driveLetterList.push_back(UIPathOperations::replaceDosDelimeter(strPoint));
+    }
+    else
+    {
+        for (int i = 'A'; i <= 'Z'; ++i)
+        {
+            QString path((char)i);
+            path += ":/";
+            bool exists = m_comGuestSession.DirectoryExists(path, false /* aFollowSymlinks */);
+            if (exists)
+                m_driveLetterList.push_back(path);
+        }
+    }
 }