VirtualBox

Timestamp:

Sep 17, 2018 11:44:43 AM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: VBoxGlobal todo fix: Make sure url argument list being cleared on return.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

-              r73953
+              r74305
+}
+QList<QUrl> VBoxGlobal::takeArgumentUrls()
+{
+    const QList<QUrl> result = m_listArgUrls;
+    m_listArgUrls.clear();
+    return result;
+}
 #ifdef VBOX_WITH_DEBUGGER_GUI

-              r73953
+              r74305
         bool processArgs();
         /** Returns the URL arguments list. */
         QList<QUrl> &argUrlList() { return m_listArgUrls; }
+        /** Takes and returns the URL argument list while clearing the source. */
+        QList<QUrl> takeArgumentUrls();
         /** Returns the --startvm option value (managed VM id). */

-              r74272
+              r74305
 void UIVirtualBoxManager::sltHandleOpenUrlCall(QList<QUrl> list /* = QList<QUrl>() */)
+{
     /* If passed list is empty: */
+    /* If passed list is empty, we take the one from VBoxGlobal: */
     if (list.isEmpty())
+    {
+        /* We take the one which stored in VBoxGlobal: */
+        list = vboxGlobal().argUrlList();
+        vboxGlobal().argUrlList().clear();
+        /// @todo Rework this getter to do .clear() as well.
+    }
+        list = vboxGlobal().takeArgumentUrls();
     /* Check if we are can handle the dropped urls: */

-              r74216
+              r74305
     qApp->processEvents();
+    /* If passed list is empty, we take the one from VBoxGlobal: */
     if (list.isEmpty())
+    {
+        list = vboxGlobal().argUrlList();
+        vboxGlobal().argUrlList().clear();
+    }
+        list = vboxGlobal().takeArgumentUrls();
     /* Check if we are can handle the dropped urls. */
     for (int i = 0; i < list.size(); ++i)

Note: See TracChangeset for help on using the changeset viewer.