Changeset 29882 in vbox for trunk/src

Timestamp:

May 30, 2010 3:21:02 PM (15 years ago)

Author:

vboxsync

Message:

ConsoleImplTeleporter.cpp: Fixed missing VMR3PowerOff when canceling the teleportation very early.

File:

• trunk/src/VBox/Main/ConsoleImplTeleporter.cpp (modified) (4 diffs)

trunk/src/VBox/Main/ConsoleImplTeleporter.cpp

@@ -989 +989 @@
 Console::teleporterTrg(PVM pVM, IMachine *pMachine, bool fStartPaused, Progress *pProgress)
 {
+    LogThisFunc(("pVM=%p pMachine=%p fStartPaused=%RTbool pProgress=%p\n", pVM, pMachine, fStartPaused, pProgress));
+
     /*
      * Get the config.
@@ -1058 +1060 @@
             theState.mhServer          = hServer;
 
+            bool fPowerOff;
             void *pvUser = static_cast<void *>(static_cast<TeleporterState *>(&theState));
             if (pProgress->setCancelCallback(teleporterProgressCancelCallback, pvUser))
@@ -1065 +1068 @@
                 pProgress->setCancelCallback(NULL, NULL);
 
-                bool fPowerOff = false;
+                fPowerOff = false;
                 if (vrc == VERR_TCP_SERVER_STOP)
                 {
@@ -1102 +1105 @@
                     fPowerOff = true;
                 }
-
-                if (fPowerOff)
-                {
-                    int vrc2 = VMR3PowerOff(pVM);
-                    AssertRC(vrc2);
-                }
             }
             else
+            {
+                LogThisFunc(("Canceled - check point #1\n"));
                 vrc = VERR_SSM_CANCELLED;
+                fPowerOff = true;
+            }
+
+            if (fPowerOff)
+            {
+                int vrc2 = VMR3PowerOff(pVM);
+                AssertRC(vrc2);
+            }
         }