Changeset 5792 in vbox

Timestamp:

Nov 19, 2007 12:29:44 PM (17 years ago)

Author:

vboxsync

Message:

2507: "Changing any VM setting after creating a new VM cancels the First Run Wizard" fixed.

Location:

trunk/src/VBox/Frontends/VirtualBox/ui

Files:

• VBoxVMSettingsDlg.ui (modified) (2 diffs)
• VBoxVMSettingsDlg.ui.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui

@@ -3167 +3167 @@
     <variable access="private">BootItemsList *tblBootOrder;</variable>
     <variable access="private">QString mNoInterfaces;</variable>
+    <variable access="private">bool mAllowResetFRF;</variable>
     <variable access="private">bool mResetFirstRunFlag;</variable>
 </variables>
@@ -3207 +3208 @@
     <slot>hostInterfaceAdd()</slot>
     <slot>hostInterfaceRemove()</slot>
+    <slot>onMediaEnumDone()</slot>
     <slot>resetFirstRunFlag()</slot>
 </slots>

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h

@@ -474 +474 @@
     polished = false;
 
+    mAllowResetFRF = false;
+    connect (&vboxGlobal(), SIGNAL (mediaEnumFinished (const VBoxMediaList &)),
+             this, SLOT (onMediaEnumDone()));
     mResetFirstRunFlag = false;
 
@@ -826 +829 @@
     /* Boot-order table */
     tblBootOrder = new BootItemsList (groupBox12, "tblBootOrder");
-    connect (tblBootOrder, SIGNAL (bootSequenceChanged()),
-             this, SLOT (resetFirstRunFlag()));
+
     /* Fixing focus order for BootItemsList */
     setTabOrder (tbwGeneral, tblBootOrder);
@@ -1137 +1139 @@
 
 
+void VBoxVMSettingsDlg::onMediaEnumDone()
+{
+    mAllowResetFRF = true;
+}
+
+
 void VBoxVMSettingsDlg::resetFirstRunFlag()
 {
-    mResetFirstRunFlag = true;
+    if (mAllowResetFRF)
+        mResetFirstRunFlag = true;
 }
 
@@ -1570 +1579 @@
     /* Boot-order */
     tblBootOrder->getFromMachine (machine);
+    connect (tblBootOrder, SIGNAL (bootSequenceChanged()),
+             this, SLOT (resetFirstRunFlag()));
 
     /* ACPI */