Changeset 13696 in vbox for trunk/src/VBox/Main/MachineImpl.cpp

Timestamp:

Oct 30, 2008 9:58:59 PM (16 years ago)

Author:

vboxsync

Message:

Main: Fixed: Closing sessions was not always noticed by the server which caused a hang during poweroff (regression after adding spawning session watchdog).

File:

• trunk/src/VBox/Main/MachineImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -3834 +3834 @@
 #if defined (RT_OS_WINDOWS)
 bool Machine::isSessionOpen (ComObjPtr <SessionMachine> &aMachine,
-                             HANDLE *aIPCSem /*= NULL*/)
+                             HANDLE *aIPCSem /*= NULL*/,
+                             bool aAllowClosing /*= false*/)
 #elif defined (RT_OS_OS2)
 bool Machine::isSessionOpen (ComObjPtr <SessionMachine> &aMachine,
-                             HMTX *aIPCSem /*= NULL*/);
+                             HMTX *aIPCSem /*= NULL*/,
+                             bool aAllowClosing /*= false*/);
 #else
-bool Machine::isSessionOpen (ComObjPtr <SessionMachine> &aMachine)
+bool Machine::isSessionOpen (ComObjPtr <SessionMachine> &aMachine,
+                             bool aAllowClosing /*= false*/)
 #endif
 {
@@ -3851 +3854 @@
     AutoReadLock alock (this);
 
-    if (mData->mSession.mState == SessionState_Open)
+    if (mData->mSession.mState == SessionState_Open ||
+        (aAllowClosing && mData->mSession.mState == SessionState_Closing))
     {
         AssertReturn (!mData->mSession.mMachine.isNull(), false);