Changeset 62315 in vbox

Timestamp:

Jul 19, 2016 11:25:26 AM (9 years ago)

Author:

vboxsync

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

108851

Message:

FE/Qt: bugref:8490: Selector UI: Process FileOpen event even when selector window is not active and fixing issue with file name parsing.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp

@@ -87 +87 @@
 void UISelectorWindow::create()
 {
-    /* Make sure selector-window is not created: */
-    AssertReturnVoid(!m_spInstance);
+    /* Return if selector-window is already created: */
+    if (m_spInstance)
+        return;
 
     /* Create selector-window: */
@@ -1135 +1136 @@
 bool UISelectorWindow::eventFilter(QObject *pObject, QEvent *pEvent)
 {
-    /* Ignore for non-active window: */
-    if (!isActiveWindow())
+    /* Ignore for non-active window except for FileOpen event which should be always processed: */
+    if (!isActiveWindow() && pEvent->type() != QEvent::FileOpen)
         return QIWithRetranslateUI<QMainWindow>::eventFilter(pObject, pEvent);
 
@@ -1149 +1150 @@
         case QEvent::FileOpen:
         {
-            sltOpenUrls(QList<QUrl>() << static_cast<QFileOpenEvent*>(pEvent)->file());
+            sltOpenUrls(QList<QUrl>() << static_cast<QFileOpenEvent*>(pEvent)->url());
             pEvent->accept();
             return true;