Changeset 16304 in vbox

Timestamp:

Jan 28, 2009 12:47:48 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: 3225: Disable ACPI actions if guest is not entered ACPI for now. Removed unnecessary timer.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxConsoleWnd.h (modified) (2 diffs)
• src/VBoxConsoleWnd.cpp (modified) (8 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleWnd.h

@@ -217 +217 @@
     void updateMediaDriveState (VBoxDefs::MediaType aType);
     void updateSharedFoldersState();
-    void updateACPIStatus();
 
     void tryClose();
@@ -327 +326 @@
     QString caption_prefix;
 
-    QTimer *mACPITimer;
-    bool mACPIEnabled : 1;
-
     bool no_auto_close : 1;
 

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

@@ -224 +224 @@
     , console (0)
     , machine_state (KMachineState_Null)
-    , mACPIEnabled (false)
     , no_auto_close (false)
     , mIsFullscreen (false)
@@ -245 +244 @@
 
     idle_timer = new QTimer (this);
-    mACPITimer = new QTimer (this);
 
 #if !(defined (Q_WS_WIN) || defined (Q_WS_MAC))
@@ -916 +914 @@
     idle_timer->start (50);
 
-    /* start an idle timer that will update acpi status */
-    connect (mACPITimer, SIGNAL (timeout()), SLOT (updateACPIStatus()));
-    mACPITimer->start (1000);
-
     connect (console, SIGNAL (mouseStateChanged (int)),
              this, SLOT (updateMouseState (int)));
@@ -1280 +1274 @@
     static const char *kDiscardCurState = "discardCurState";
 
+    bool isACPIEnabled = csession.GetConsole().GetGuestEnteredACPIMode();
+
     if (!console)
     {
@@ -1347 +1343 @@
                     dlg.mRbSave->setFocus();
                 }
-                else if ((lastAction [0] == kPowerOff) && !mACPIEnabled)
+                else if ((lastAction [0] == kPowerOff) && !isACPIEnabled)
                 {
                     dlg.mRbShutdown->setEnabled (false);
@@ -1519 +1515 @@
         idle_timer->disconnect (SIGNAL (timeout()), this, SLOT (updateDeviceLights()));
 
-        /* Stop ACPI update timer */
-        mACPITimer->stop();
-        mACPITimer->disconnect (SIGNAL (timeout()), this, SLOT (updateACPIStatus()));
-
         /* Hide console window */
         hide();
@@ -2609 +2601 @@
 void VBoxConsoleWnd::vmACPIShutdown()
 {
-    if (!mACPIEnabled)
+    if (!csession.GetConsole().GetGuestEnteredACPIMode())
         return vboxProblem().cannotSendACPIToMachine();
 
@@ -3546 +3538 @@
 }
 
-void VBoxConsoleWnd::updateACPIStatus()
-{
-    mACPIEnabled = csession.GetConsole().GetGuestEnteredACPIMode();
-}
-
 /**
  *  Helper to safely close the main console window.