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

Timestamp:

Feb 19, 2019 11:16:35 AM (6 years ago)

Author:

vboxsync

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

128898

Message:

FE/Qt: bugref:9340. Dont use/update recent medium list for hard disk when there is a vm content.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (3 diffs)
• medium/UIMediumManager.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -2586 +2586 @@
     QString allType;
     QString strLastFolder = defaultFolderPathForType(enmMediumType);
+
+    /* For DVDs and Floppies always check first the last recently used medium folder. For hard disk use
+       the caller's setting: */
+    fUseLastFolder = (enmMediumType == UIMediumDeviceType_DVD) || (enmMediumType == UIMediumDeviceType_Floppy);
+
     switch (enmMediumType)
     {
@@ -2637 +2642 @@
     {
         QUuid uMediumId = openMedium(enmMediumType, files[0], pParent);
-        updateRecentlyUsedMediumListAndFolder(enmMediumType, medium(uMediumId).location());
+        if (enmMediumType == UIMediumDeviceType_DVD || enmMediumType == UIMediumDeviceType_Floppy ||
+            (enmMediumType == UIMediumDeviceType_HardDisk && fUseLastFolder))
+            updateRecentlyUsedMediumListAndFolder(enmMediumType, medium(uMediumId).location());
         return uMediumId;
     }
@@ -2696 +2703 @@
     }
     if (!uMediumId.isNull())
-        updateRecentlyUsedMediumListAndFolder(enmMediumType, medium(uMediumId).location());
-
+    {
+        /* Update the recent medium list only if the mdium type is DVD or floppy. In case of hard disk
+           update those only if there is no vm context: */
+        if (enmMediumType == UIMediumDeviceType_DVD || enmMediumType == UIMediumDeviceType_Floppy ||
+            (enmMediumType == UIMediumDeviceType_HardDisk && strMachineName.isEmpty()))
+            updateRecentlyUsedMediumListAndFolder(enmMediumType, medium(uMediumId).location());
+    }
     return uMediumId;
 }

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp

@@ -489 +489 @@
 {
     QString strDefaultMachineFolder = vboxGlobal().virtualBox().GetSystemProperties().GetDefaultMachineFolder();
-    vboxGlobal().openMediumWithFileOpenDialog(currentMediumType(), this, strDefaultMachineFolder);
+    vboxGlobal().openMediumWithFileOpenDialog(currentMediumType(), this,
+                                              strDefaultMachineFolder, true /* use most recent medium folder */);
 }