Changeset 92552 in vbox

Timestamp:

Nov 22, 2021 3:44:57 PM (3 years ago)

Author:

vboxsync

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

148433

Message:

FE/Qt: bugref:9974. Fizing broken signal slot connection for machine reset.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineLogic.cpp (modified) (4 diffs)
• UIMachineLogic.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -1804 +1804 @@
 }
 
-void UIMachineLogic::sltReset(bool fShowConfirmation /* = true */)
-{
-    if (fShowConfirmation)
-    {
-        /* Confirm/Reset current console: */
-        if (msgCenter().confirmResetMachine(machineName()))
-            console().Reset();
-    }
-    else
-        console().Reset();
-
-    /* TODO_NEW_CORE: On reset the additional screens didn't get a display
-       update. Emulate this for now until it get fixed. */
-    ulong uMonitorCount = machine().GetGraphicsAdapter().GetMonitorCount();
-    for (ulong uScreenId = 1; uScreenId < uMonitorCount; ++uScreenId)
-        machineWindows().at(uScreenId)->update();
+void UIMachineLogic::sltReset()
+{
+    reset(true);
 }
 
@@ -3266 +3253 @@
     UIBootFailureDialog *pBootFailureDialog = new UIBootFailureDialog(activeMachineWindow(), machine());
     AssertPtrReturnVoid(pBootFailureDialog);
-    connect(actionPool()->action(UIActionIndexRT_M_Machine_S_Reset), &UIAction::triggered,
-            this, &UIMachineLogic::sltReset);
 
     int iResult = pBootFailureDialog->exec(false);
@@ -3279 +3264 @@
 
     if (iResult == static_cast<int>(UIBootFailureDialog::ReturnCode_Reset))
-        sltReset(false);
+        reset(false);
 }
 
@@ -3396 +3381 @@
 }
 
+void UIMachineLogic::reset(bool fShowConfirmation)
+{
+    if (fShowConfirmation)
+    {
+        /* Confirm/Reset current console: */
+        if (msgCenter().confirmResetMachine(machineName()))
+            console().Reset();
+    }
+    else
+        console().Reset();
+
+    /* TODO_NEW_CORE: On reset the additional screens didn't get a display
+       update. Emulate this for now until it get fixed. */
+    ulong uMonitorCount = machine().GetGraphicsAdapter().GetMonitorCount();
+    for (ulong uScreenId = 1; uScreenId < uMonitorCount; ++uScreenId)
+        machineWindows().at(uScreenId)->update();
+}
+
 #endif /* VBOX_WITH_DEBUGGER_GUI */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h

@@ -272 +272 @@
     void sltShowFileManagerDialog();
     void sltCloseFileManagerDialog();
-    void sltReset(bool fShowConfirmation = true);
+    void sltReset();
     void sltPause(bool fOn);
     void sltDetach();
@@ -390 +390 @@
     /** Attempts to mount medium with @p uMediumId to the machine if it can find an appropriate controller and port. */
     bool mountBootMedium(const QUuid &uMediumId);
+    /** Resets the machine. If @p fShowConfirmation is true then a confirmation messag box is shown first. */
+    void reset(bool fShowConfirmation);
 
     /* Private variables: */