Changeset 76833 in vbox

Timestamp:

Jan 16, 2019 10:51:50 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9361: A couple of fixes for args processing: First of all, handle relative path properly if file really exists in current folder; Besides that filter out handled URL properly as well.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp (modified) (3 diffs)

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

@@ -465 +465 @@
         if (   !strArg.isEmpty()
             && QFile::exists(strArg))
-            listArgUrls << QUrl::fromLocalFile(strArg);
+            listArgUrls << QUrl::fromLocalFile(QFileInfo(strArg).absoluteFilePath());
     }
 
@@ -475 +475 @@
         {
             /* Check which of them has allowed VM extensions: */
-            const QString &strFile = listArgUrls.at(i).toLocalFile();
+            const QUrl url = listArgUrls.at(i);
+            const QString strFile = url.toLocalFile();
             if (VBoxGlobal::hasAllowedExtension(strFile, VBoxFileExts))
             {
@@ -486 +487 @@
                     launchMachine(comMachine);
                     /* And remove their URLs from the ULR list: */
-                    listArgUrls.removeAll(strFile);
+                    listArgUrls.removeAll(url);
                 }
             }