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

Timestamp:

Apr 23, 2020 10:15:07 AM (5 years ago)

Author:

vboxsync

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

137491

Message:

FE/Qt: bugref:7127: VM settings: No need to wait for media-enumeration to be finished to allow to reset first run wizard flag; It's a consequence of large media-enumeration rework where the procedure itself became optional step of VM settings open sequence.

Location:

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

Files:

• UISettingsDialogSpecific.cpp (modified) (3 diffs)
• UISettingsDialogSpecific.h (modified) (2 diffs)

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

@@ -331 +331 @@
     , m_strCategory(strCategory)
     , m_strControl(strControl)
-    , m_fAllowResetFirstRunFlag(false)
     , m_fResetFirstRunFlag(false)
 {
@@ -664 +663 @@
 }
 
-void UISettingsDialogMachine::sltAllowResetFirstRunFlag()
-{
-    m_fAllowResetFirstRunFlag = true;
-}
-
 void UISettingsDialogMachine::sltResetFirstRunFlag()
 {
     if (m_fAllowResetFirstRunFlag)
-        m_fResetFirstRunFlag = true;
+    m_fResetFirstRunFlag = true;
 }
 
@@ -681 +675 @@
     setWindowIcon(QIcon(":/vm_settings_16px.png"));
 #endif
-
-    /* Allow to reset first-run flag just when medium-enumeration was finished: */
-    connect(&uiCommon(), &UICommon::sigMediumEnumerationFinished,
-            this, &UISettingsDialogMachine::sltAllowResetFirstRunFlag);
 
     /* Make sure settings window will be updated on session/machine state/data changes: */

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

@@ -127 +127 @@
     void sltMachineDataChanged(const QUuid &uMachineId);
 
-    /** Handles request to allow to reset first run flag. */
-    void sltAllowResetFirstRunFlag();
     /** Handles request to reset first run flag. */
     void sltResetFirstRunFlag();
@@ -165 +163 @@
     CConsole  m_console;
 
-    /** Holds whether we are allowed to reset first run flag. */
-    bool  m_fAllowResetFirstRunFlag : 1;
     /** Holds whether we have request to reset first run flag. */
-    bool  m_fResetFirstRunFlag : 1;
+    bool  m_fResetFirstRunFlag;
 };