Changeset 77189 in vbox for trunk/src/VBox/Frontends

Timestamp:

Feb 6, 2019 8:47:57 PM (6 years ago)

Author:

vboxsync

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

128678

Message:

FE/Qt: bugref:9340. Use correct machine folder path.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (1 diff)
• medium/UIMediumSelector.cpp (modified) (2 diffs)
• medium/UIMediumSelector.h (modified) (1 diff)
• settings/machine/UIMachineSettingsStorage.cpp (modified) (4 diffs)

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

@@ -2750 +2750 @@
     if (pDialog->exec())
     {
+        delete pDialog;
         return pDialog->mediumID();
     }

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

@@ -76 +76 @@
     , m_pSearchWidget(0)
     , m_iCurrentShownIndex(0)
-    , m_strMachineSettingsFilePath(machineSettingsFilePath)
+    , m_strMachineFolder(machineSettingsFilePath)
     , m_strMachineName(machineName)
     , m_strMachineGuestOSTypeId(strMachineGuestOSTypeId)
@@ -438 +438 @@
 
     if (m_enmMediumType == UIMediumDeviceType_Floppy)
-        uMediumId = vboxGlobal().showCreateFloppyDiskDialog(this, m_strMachineName, m_strMachineSettingsFilePath);
+        uMediumId = vboxGlobal().showCreateFloppyDiskDialog(this, m_strMachineName, m_strMachineFolder);
     else if (m_enmMediumType == UIMediumDeviceType_HardDisk)
-        uMediumId = vboxGlobal().createHDWithNewHDWizard(this, m_strMachineGuestOSTypeId, m_strMachineSettingsFilePath);
+        uMediumId = vboxGlobal().createHDWithNewHDWizard(this, m_strMachineGuestOSTypeId, m_strMachineFolder);
     else if (m_enmMediumType == UIMediumDeviceType_DVD)
-        uMediumId = vboxGlobal().createVisoMediumWithVisoCreator(this, m_strMachineName, m_strMachineSettingsFilePath);
+        uMediumId = vboxGlobal().createVisoMediumWithVisoCreator(this, m_strMachineName, m_strMachineFolder);
 
     if (!uMediumId.isNull())

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.h

@@ -146 +146 @@
     int                   m_iCurrentShownIndex;
     QBrush                m_defaultItemForeground;
-    QString               m_strMachineSettingsFilePath;
+    QString               m_strMachineFolder;
     QString               m_strMachineName;
     QString               m_strMachineGuestOSTypeId;

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp

@@ -3800 +3800 @@
     QUuid uMediumId;
     int iAnswer = static_cast<int>(UIMediumSelector::ReturnCode_Rejected);
+
     switch (enmDevice)
     {
@@ -3805 +3806 @@
         {
             iAnswer = vboxGlobal().openMediumSelectorDialog(this, UIMediumDeviceType_HardDisk, uMediumId,
-                                                            m_strMachineName, m_strMachineSettingsFilePath,
+                                                            m_strMachineName, strMachineFolder,
                                                             m_strMachineGuestOSTypeId);
             break;
@@ -3812 +3813 @@
         {
             iAnswer = vboxGlobal().openMediumSelectorDialog(this, UIMediumDeviceType_DVD, uMediumId,
-                                                            m_strMachineName, m_strMachineSettingsFilePath);
+                                                            m_strMachineName, strMachineFolder);
             break;
         }
@@ -3818 +3819 @@
         {
             iAnswer = vboxGlobal().openMediumSelectorDialog(this, UIMediumDeviceType_Floppy, uMediumId,
-                                                            m_strMachineName, m_strMachineSettingsFilePath);
+                                                            m_strMachineName, strMachineFolder);
         }
         default: break; /* Shut up, MSC! */