Changeset 16372 in vbox

Timestamp:

Jan 29, 2009 3:25:19 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: 3225: Disable ACPI actions if ACPI is not supported atm. Logic reworked according last requirements from comment #16.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp (modified) (3 diffs)

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

@@ -1348 +1348 @@
                 QStringList lastAction =
                     cmachine.GetExtraData (VBoxDefs::GUI_LastCloseAction).split (',');
+                bool wasDiscardCurState = lastAction.count() > 1 &&
+                                          lastAction [1] == kDiscardCurState;
                 AssertWrapperOk (cmachine);
                 if (lastAction [0] == kSave)
@@ -1354 +1356 @@
                     dlg.mRbSave->setFocus();
                 }
-                else if ((lastAction [0] == kPowerOff) && !isACPIEnabled)
+                else if (wasDiscardCurState || !isACPIEnabled)
                 {
-                    dlg.mRbShutdown->setEnabled (false);
+                    dlg.mRbShutdown->setEnabled (isACPIEnabled);
                     dlg.mRbPowerOff->setChecked (true);
                     dlg.mRbPowerOff->setFocus();
@@ -1365 +1367 @@
                     dlg.mRbShutdown->setFocus();
                 }
-                dlg.mCbDiscardCurState->setChecked (
-                    lastAction.count() > 1 && lastAction [1] == kDiscardCurState);
+                dlg.mCbDiscardCurState->setChecked (wasDiscardCurState);
             }
             else