Changeset 33689 in vbox for trunk/src/VBox

Timestamp:

Nov 2, 2010 1:30:00 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: Crash fix in UISettingsSerializer.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp

@@ -23 +23 @@
 #include <QMutex>
 #include <QWaitCondition>
+#include <QTimer>
 
 /* Local includes */
@@ -79 +80 @@
         , m_data(data)
         , m_fConditionDone(false)
+        , m_fAllowToDestroySerializer(false)
         , m_iPageIdWeAreWaitingFor(-1)
         , m_iIdOfHighPriorityPage(-1)
@@ -85 +87 @@
         connect(this, SIGNAL(sigNotifyAboutPageProcessed(int)), this, SLOT(sltHandleProcessedPage(int)), Qt::QueuedConnection);
         connect(this, SIGNAL(sigNotifyAboutPagesProcessed()), this, SLOT(sltHandleProcessedPages()), Qt::QueuedConnection);
-        connect(this, SIGNAL(finished()), this, SLOT(deleteLater()), Qt::QueuedConnection);
+        connect(this, SIGNAL(finished()), this, SLOT(sltDestroySerializer()), Qt::QueuedConnection);
 
         /* Set instance: */
@@ -194 +196 @@
         if (!m_fConditionDone)
             m_fConditionDone = true;
+    }
+
+    /* Slot to destroy serializer: */
+    void sltDestroySerializer()
+    {
+        /* If not yet all events were processed,
+         * we should postpone destruction for now: */
+        if (!m_fAllowToDestroySerializer)
+            QTimer::singleShot(0, this, SLOT(sltDestroySerializer()));
+        else
+            deleteLater();
     }
 
@@ -214 +227 @@
             m_mutex.unlock();
         }
+        m_fAllowToDestroySerializer = true;
     }
 
@@ -261 +275 @@
     UISettingsPageMap m_pages;
     bool m_fConditionDone;
+    bool m_fAllowToDestroySerializer;
     int m_iPageIdWeAreWaitingFor;
     int m_iIdOfHighPriorityPage;