Changeset 108079 in vbox

Timestamp:

Feb 5, 2025 4:08:19 PM (2 weeks ago)

Author:

vboxsync

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

167373

Message:

FE/Qt: VM settings dialog: A bit of changes to VM settings save/discard close transaction.

Location:

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

Files:

• UIAdvancedSettingsDialog.cpp (modified) (4 diffs)
• UIAdvancedSettingsDialog.h (modified) (1 diff)

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

@@ -783 +783 @@
     , m_fFirstSerializationDone(false)
     , m_fSerializationIsInProgress(false)
-    , m_fSerializationClean(false)
+    , m_fSerializationClean(true)
     , m_fClosed(false)
     , m_iPageId(MachineSettingsPageType_Invalid)
@@ -812 +812 @@
     save();
 
-    /* Close if there is no ongoing serialization
-     * and previous try was successful: */
-    if (   !isSerializationInProgress()
-        && m_fSerializationClean)
-        sltClose();
-}
-
-void UIAdvancedSettingsDialog::reject()
-{
-    /* Close if there is no ongoing serialization: */
-    if (!isSerializationInProgress())
+    /* Close if last serialization haven't failed: */
+    if (m_fSerializationClean)
         sltClose();
 }
@@ -1312 +1303 @@
 void UIAdvancedSettingsDialog::sltClose()
 {
-    /* Check whether serialization was clean (save)
-     * or there are no unsaved settings to be lost (cancel): */
-    if (   m_fSerializationClean
-        || !isSettingsChanged()
+    /* Do not close if serialization happens atm: */
+    if (isSerializationInProgress())
+        return;
+
+    /* Make sure there are no unsaved settings to be lost
+     * or user agreed to forget them after all: */
+    if (   !isSettingsChanged()
         || msgCenter().confirmSettingsDiscarding(this))
     {
@@ -1576 +1570 @@
         m_pButtonBox->button(QDialogButtonBox::Ok)->setShortcut(Qt::Key_Return);
         m_pButtonBox->button(QDialogButtonBox::Cancel)->setShortcut(Qt::Key_Escape);
-        connect(m_pButtonBox, &QIDialogButtonBox::rejected, this, &UIAdvancedSettingsDialog::reject);
+        connect(m_pButtonBox, &QIDialogButtonBox::rejected, this, &UIAdvancedSettingsDialog::sltClose);
         connect(m_pButtonBox, &QIDialogButtonBox::accepted, this, &UIAdvancedSettingsDialog::accept);
         connect(m_pButtonBox->button(QDialogButtonBox::Help), &QAbstractButton::pressed,

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

@@ -94 +94 @@
     /** Hides the modal dialog and sets the result code to Accepted. */
     virtual void accept();
-    /** Hides the modal dialog and sets the result code to Rejected. */
-    virtual void reject();
 
     /** Handles category change to @a cId. */