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

Timestamp:

Dec 15, 2017 2:08:04 PM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8900: No need to manually close QIManagerDialog dialogs, it's ignored anyway; Protect QIManagerDialog against cascade closing, that can cause crash due to race (mostly on X11).

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIManagerDialog.cpp (modified) (2 diffs)
• extensions/QIManagerDialog.h (modified) (2 diffs)
• selector/UISelectorWindow.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.cpp

@@ -61 +61 @@
 QIManagerDialog::QIManagerDialog(QWidget *pCenterWidget)
     : pCenterWidget(pCenterWidget)
+    , m_fCloseEmitted(false)
     , m_pWidget(0)
     , m_pWidgetMenu(0)
@@ -223 +224 @@
     /* Ignore the event itself: */
     pEvent->ignore();
-    /* But tell the listener to close us: */
-    emit sigClose();
+    /* But tell the listener to close us (once): */
+    if (!m_fCloseEmitted)
+    {
+        m_fCloseEmitted = true;
+        emit sigClose();
+    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.h

@@ -165 +165 @@
     /** @} */
 
-        /** @name Functions related to geometry restoration.
-         * @{ */
-        /* Sets the position and size of the dialog. */
+    /** @name Functions related to geometry restoration.
+     * @{ */
+        /** Sets the position and size of the dialog. */
         void setDialogGeometry(const QRect &geometry);
         /** Returns whether the window should be maximized when geometry being restored. */
         virtual bool shouldBeMaximized() const { return false; }
-        /** @} */
+    /** @} */
 
 private:
@@ -179 +179 @@
         /** Holds the widget reference to center Host Network Manager according. */
         QWidget *pCenterWidget;
+
+        /** Holds whether the manager had emitted command to be closed. */
+        bool m_fCloseEmitted;
     /** @} */
 

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

@@ -453 +453 @@
     /* Destroy instance if still exists: */
     if (m_pManagerVirtualMedia)
-    {
-        m_pManagerVirtualMedia->close();
         UIMediumManagerFactory().cleanup(m_pManagerVirtualMedia);
-    }
 }
 
@@ -486 +483 @@
     /* Destroy instance if still exists: */
     if (m_pManagerHostNetwork)
-    {
-        m_pManagerHostNetwork->close();
         UIHostNetworkManagerFactory().cleanup(m_pManagerHostNetwork);
-    }
 }