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

Timestamp:

May 8, 2015 7:31:25 AM (10 years ago)

Author:

vboxsync

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

100156

Message:

FE/Qt: Settings dialog: Fixing serialization flaw due to which session unlocked event can be missed.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/settings

Files:

• UISettingsDialog.cpp (modified) (6 diffs)
• UISettingsDialog.h (modified) (2 diffs)
• UISettingsDialogSpecific.cpp (modified) (7 diffs)

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

@@ -63 +63 @@
     , m_configurationAccessLevel(ConfigurationAccessLevel_Null)
     , m_fPolished(false)
-    /* Loading/saving stuff: */
+    /* Serialization stuff: */
     , m_pSerializeProcess(0)
-    , m_fLoaded(false)
-    , m_fSaved(false)
+    , m_fSerializationIsInProgress(false)
     /* Status-bar stuff: */
     , m_pStatusBar(0)
@@ -220 +219 @@
     }
 
-    /* Mark as loaded: */
-    m_fLoaded = true;
+    /* Mark serialization finished: */
+    m_fSerializationIsInProgress = false;
 }
 
@@ -233 +232 @@
     }
 
-    /* Mark as saved: */
-    m_fSaved = true;
+    /* Mark serialization finished: */
+    m_fSerializationIsInProgress = false;
 }
 
@@ -257 +256 @@
 void UISettingsDialog::loadData(QVariant &data)
 {
-    /* Mark as not loaded: */
-    m_fLoaded = false;
+    /* Mark serialization started: */
+    m_fSerializationIsInProgress = true;
 
     /* Create settings loader: */
@@ -283 +282 @@
 void UISettingsDialog::saveData(QVariant &data)
 {
-    /* Mark as not saved: */
-    m_fSaved = false;
+    /* Mark serialization started: */
+    m_fSerializationIsInProgress = true;
 
     /* Create the 'settings saver': */
@@ -531 +530 @@
 void UISettingsDialog::reject()
 {
-    if (m_fLoaded)
+    if (!isSerializationInProgress())
         QIMainDialog::reject();
 }

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.h

@@ -73 +73 @@
     /** Returns the serialize process instance. */
     UISettingsSerializer* serializeProcess() const { return m_pSerializeProcess; }
+    /** Returns whether the serialization is in progress. */
+    bool isSerializationInProgress() const { return m_fSerializationIsInProgress; }
 
     /** Loads the @a data. */
@@ -143 +145 @@
     /** Holds the serialize process instance. */
     UISettingsSerializer *m_pSerializeProcess;
-
-    /* Loading/saving stuff: */
-    bool m_fLoaded;
-    bool m_fSaved;
+    /** Holds whether the serialization is in progress. */
+    bool m_fSerializationIsInProgress;
 
     /* Status bar widget: */

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

@@ -332 +332 @@
     connect(&vboxGlobal(), SIGNAL(sigMediumEnumerationFinished()), this, SLOT(sltAllowResetFirstRunFlag()));
 
+    /* Make sure settings window will be updated on session/machine state/data changes: */
+    connect(gVBoxEvents, SIGNAL(sigSessionStateChange(QString, KSessionState)),
+            this, SLOT(sltSessionStateChanged(QString, KSessionState)));
+    connect(gVBoxEvents, SIGNAL(sigMachineStateChange(QString, KMachineState)),
+            this, SLOT(sltMachineStateChanged(QString, KMachineState)));
+    connect(gVBoxEvents, SIGNAL(sigMachineDataChange(QString)),
+            this, SLOT(sltMachineDataChanged(QString)));
+
     /* Get corresponding machine (required to determine dialog type and page availability): */
     m_machine = vboxGlobal().virtualBox().FindMachine(m_strMachineId);
@@ -500 +508 @@
         return;
 
-    /* Disconnect global VBox events from this dialog: */
-    gVBoxEvents->disconnect(this);
-
     /* Prepare session: */
     m_session = configurationAccessLevel() == ConfigurationAccessLevel_Null ? CSession() :
@@ -528 +533 @@
     if (!m_session.isNull())
         return;
-
-    /* Disconnect global VBox events from this dialog: */
-    gVBoxEvents->disconnect(this);
 
     /* Prepare session: */
@@ -735 +737 @@
         m_console = CConsole();
     }
-
-    /* Make sure settings window will be updated on machine state/data changes: */
-    connect(gVBoxEvents, SIGNAL(sigSessionStateChange(QString, KSessionState)),
-            this, SLOT(sltSessionStateChanged(QString, KSessionState)));
-    connect(gVBoxEvents, SIGNAL(sigMachineStateChange(QString, KMachineState)),
-            this, SLOT(sltMachineStateChanged(QString, KMachineState)));
-    connect(gVBoxEvents, SIGNAL(sigMachineDataChange(QString)),
-            this, SLOT(sltMachineDataChanged(QString)));
 }
 
@@ -762 +756 @@
 void UISettingsDialogMachine::sltSessionStateChanged(QString strMachineId, KSessionState sessionState)
 {
+    /* Ignore if serialization is in progress: */
+    if (isSerializationInProgress())
+        return;
+
     /* Ignore if thats NOT our VM: */
     if (strMachineId != m_strMachineId)
@@ -779 +777 @@
 void UISettingsDialogMachine::sltMachineStateChanged(QString strMachineId, KMachineState machineState)
 {
+    /* Ignore if serialization is in progress: */
+    if (isSerializationInProgress())
+        return;
+
     /* Ignore if thats NOT our VM: */
     if (strMachineId != m_strMachineId)
@@ -796 +798 @@
 void UISettingsDialogMachine::sltMachineDataChanged(QString strMachineId)
 {
+    /* Ignore if serialization is in progress: */
+    if (isSerializationInProgress())
+        return;
+
     /* Ignore if thats NOT our VM: */
     if (strMachineId != m_strMachineId)