Changeset 18116 in vbox for trunk/src

Timestamp:

Mar 20, 2009 1:20:45 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: only test if the guest entered the ACPI state if this information is really required

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/VBoxConsoleWnd.cpp (modified) (2 diffs)
• Main/ConsoleImpl.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -1282 +1282 @@
     static const char *kDiscardCurState = "discardCurState";
 
-    bool isACPIEnabled = csession.GetConsole().GetGuestEnteredACPIMode();
-
     if (!console)
     {
@@ -1316 +1314 @@
         /* start with ignore the close event */
         e->ignore();
+
+        bool isACPIEnabled = csession.GetConsole().GetGuestEnteredACPIMode();
 
         bool success = true;

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -1613 +1613 @@
     if (mMachineState != MachineState_Running)
         return setError (VBOX_E_INVALID_VM_STATE,
-            tr ("Invalid machine state: %d)"), mMachineState);
+            tr ("Invalid machine state %d when checking if the guest entered "
+                "the ACPI mode)"), mMachineState);
 
     /* protect mpVM */