Changeset 26882 in vbox for trunk/src

Timestamp:

Feb 27, 2010 12:02:09 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: New running VM core: bug fix.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp (modified) (5 diffs)

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

@@ -142 +142 @@
     }
 
-    /* Get machine state: */
-    KMachineState state = uisession()->machineState();
-
-    switch (state)
+    switch (uisession()->machineState())
     {
         case KMachineState_PoweredOff:
@@ -175 +172 @@
             bool success = true;
 
-            bool wasPaused = uisession()->isPaused() || state == KMachineState_Stuck;
+            bool wasPaused = uisession()->isPaused() || uisession()->machineState() == KMachineState_Stuck;
             if (!wasPaused)
             {
@@ -197 +194 @@
                     dlg.mCbDiscardCurState->setText(dlg.mCbDiscardCurState->text().arg(machine.GetCurrentSnapshot().GetName()));
 
-                if (state != KMachineState_Stuck)
+                if (uisession()->machineState() != KMachineState_Stuck)
                 {
                     /* Read the last user's choice for the given VM */
@@ -342 +339 @@
             machineLogic()->setPreventAutoClose(false);
 
-            if (state == KMachineState_PoweredOff ||
-                state == KMachineState_Saved ||
-                state == KMachineState_Teleported ||
-                state == KMachineState_Aborted)
+            if (uisession()->machineState() == KMachineState_PoweredOff ||
+                uisession()->machineState() == KMachineState_Saved ||
+                uisession()->machineState() == KMachineState_Teleported ||
+                uisession()->machineState() == KMachineState_Aborted)
             {
                 /* The machine has been stopped while showing the Close or the Pause
@@ -356 +353 @@
                 {
                     /* Restore the running state if needed */
-                    if (!wasPaused && state == KMachineState_Paused)
+                    if (!wasPaused && uisession()->machineState() == KMachineState_Paused)
                         uisession()->unpause();
                 }