Changeset 108077 in vbox for trunk/src/VBox/Frontends

Timestamp:

Feb 5, 2025 3:51:45 PM (3 months ago)

Author:

vboxsync

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

167371

Message:

FE/Qt: Message-center: Make sure confirmSettingsDiscarding and confirmSettingsReloading messages do not interfere each other; That can happen on dialog closing if saving some setting was failed while saving others was't.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp (modified) (1 diff)

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

@@ -788 +788 @@
 bool UIMessageCenter::confirmSettingsDiscarding(QWidget *pParent /* = 0 */) const
 {
-    return questionBinary(pParent, MessageType_Question,
-                          tr("<p>The machine settings were changed.</p>"
-                             "<p>Would you like to discard the changed settings or to keep editing them?</p>"),
-                          0 /* auto-confirm id */,
-                          tr("Discard changes"), tr("Keep editing"));
-
+    if (   warningShown("confirmSettingsDiscarding")
+        || warningShown("confirmSettingsReloading"))
+        return false;
+    setWarningShown("confirmSettingsDiscarding", true);
+
+    const bool fResult = questionBinary(pParent, MessageType_Question,
+                                        tr("<p>The machine settings were changed.</p>"
+                                           "<p>Would you like to discard the changed settings or to keep editing them?</p>"),
+                                        0 /* auto-confirm id */,
+                                        tr("Discard changes"), tr("Keep editing"));
+
+    setWarningShown("confirmSettingsDiscarding", false);
+
+    return fResult;
 }
 
 bool UIMessageCenter::confirmSettingsReloading(QWidget *pParent /* = 0 */) const
 {
-    if (warningShown("confirmSettingsReloading"))
+    if (   warningShown("confirmSettingsReloading")
+        || warningShown("confirmSettingsDiscarding"))
         return false;
     setWarningShown("confirmSettingsReloading", true);