Changeset 90920 in vbox

Timestamp:

Aug 26, 2021 4:10:52 PM (4 years ago)

Author:

vboxsync

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

146557

Message:

FE/Qt: bugref:10067: Reworking r146504; UINotificationProgressMachinePowerDown needs machine wrapper in both cases.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter

Files:

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

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.cpp

@@ -976 +976 @@
 *********************************************************************************************************************************/
 
-UINotificationProgressMachinePowerOff::UINotificationProgressMachinePowerOff(const CMachine &comMachine)
+UINotificationProgressMachinePowerOff::UINotificationProgressMachinePowerOff(const CMachine &comMachine,
+                                                                             const CConsole &comConsole /* = CConsole() */)
     : m_comMachine(comMachine)
+    , m_comConsole(comConsole)
 {
     connect(this, &UINotificationProgress::sigProgressFinished,
@@ -983 +985 @@
 }
 
-UINotificationProgressMachinePowerOff::UINotificationProgressMachinePowerOff(const CConsole &comConsole)
-    : m_comConsole(comConsole)
-{
-    connect(this, &UINotificationProgress::sigProgressFinished,
-            this, &UINotificationProgressMachinePowerOff::sltHandleProgressFinished);
-}
-
 QString UINotificationProgressMachinePowerOff::name() const
 {
@@ -1004 +999 @@
     /* Prepare machine to power off: */
     CMachine comMachine = m_comMachine;
-
-    /* For Runtime UI: */
+    /* Prepare console to power off: */
+    CConsole comConsole = m_comConsole;
+
+    /* For Manager UI: */
     switch (uiCommon().uiType())
     {
-        case UICommon::UIType_RuntimeUI:
+        case UICommon::UIType_SelectorUI:
         {
-            /* Acquire VM: */
-            AssertReturn(m_comConsole.isNotNull(), CProgress());
-            comMachine = m_comConsole.GetMachine();
-            if (!m_comConsole.isOk())
+            /* Acquire VM id: */
+            const QUuid uId = comMachine.GetId();
+            if (!comMachine.isOk())
             {
-                comResult = m_comConsole;
+                comResult = comMachine;
                 return CProgress();
             }
 
-            break;
-        }
-        default:
-            break;
-    }
-
-    /* Acquire VM id: */
-    const QUuid uId = comMachine.GetId();
-    if (!comMachine.isOk())
-    {
-        comResult = comMachine;
-        return CProgress();
-    }
-
-    /* Acquire VM name: */
-    m_strName = comMachine.GetName();
-    if (!comMachine.isOk())
-    {
-        comResult = comMachine;
-        return CProgress();
-    }
-
-    /* Prepare console to power off: */
-    CConsole comConsole = m_comConsole;
-
-    /* For Manager UI: */
-    switch (uiCommon().uiType())
-    {
-        case UICommon::UIType_SelectorUI:
-        {
             /* Open a session thru which we will modify the machine: */
             m_comSession = uiCommon().openExistingSession(uId);
@@ -1080 +1046 @@
     /* Initialize progress-wrapper: */
     CProgress comProgress = comConsole.PowerDown();
+
+    /* For Runtime UI: */
+    switch (uiCommon().uiType())
+    {
+        case UICommon::UIType_RuntimeUI:
+        {
+            /* Check the console state, it might be already gone: */
+            if (!comConsole.isNull())
+            {
+                /* This can happen if VBoxSVC is not running: */
+                COMResult res(comConsole);
+                if (FAILED_DEAD_INTERFACE(res.rc()))
+                    return CProgress();
+            }
+
+            break;
+        }
+        default:
+            break;
+    }
+
     /* Store COM result: */
     comResult = comConsole;
+
+    /* Acquire VM name, no error checks, too late: */
+    m_strName = comMachine.GetName();
+
     /* Return progress-wrapper: */
     return comProgress;

trunk/src/VBox/Frontends/VirtualBox/src/notificationcenter/UINotificationObjects.h

@@ -567 +567 @@
 
     /** Constructs machine power-off notification-progress.
-      * @param  comMachine  Brings the machine being powered off. */
-    UINotificationProgressMachinePowerOff(const CMachine &comMachine);
-    /** Constructs machine power-off notification-progress.
-      * @param  comConsole  Brings the console of machine being powered off. */
-    UINotificationProgressMachinePowerOff(const CConsole &comConsole);
+      * @param  comMachine         Brings the machine being powered off.
+      * @param  comConsole         Brings the console of machine being powered off.
+      * @param  fIncludingDiscard  Brings whether machine state should be discarded. */
+    UINotificationProgressMachinePowerOff(const CMachine &comMachine,
+                                          const CConsole &comConsole = CConsole());
 
 protected: