Changeset 83751 in vbox for trunk/src

Timestamp:

Apr 17, 2020 1:33:03 PM (5 years ago)

Author:

vboxsync

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

137272

Message:

FE/Qt: bugref:9653: VirtualBox Manager: Cleanup for machine power down stuff.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -1062 +1062 @@
         CSession comSession = uiCommon().openExistingSession(pItem->id());
         if (comSession.isNull())
-            return;
+            break;
 
         /* Get session console: */
@@ -1068 +1068 @@
         /* Prepare machine power down: */
         CProgress comProgress = comConsole.PowerDown();
-        if (comConsole.isOk())
+        if (!comConsole.isOk())
+            msgCenter().cannotPowerDownMachine(comConsole);
+        else
         {
             /* Show machine power down progress: */
-            CMachine machine = comSession.GetMachine();
-            msgCenter().showModalProgressDialog(comProgress, machine.GetName(), ":/progress_poweroff_90px.png");
+            msgCenter().showModalProgressDialog(comProgress, pItem->name(), ":/progress_poweroff_90px.png");
             if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-                msgCenter().cannotPowerDownMachine(comProgress, machine.GetName());
-        }
-        else
-            msgCenter().cannotPowerDownMachine(comConsole);
+                msgCenter().cannotPowerDownMachine(comProgress, pItem->name());
+        }
 
         /* Unlock machine finally: */