Changeset 23841 in vbox for trunk/src/VBox/Main/ConsoleImpl.cpp

Timestamp:

Oct 17, 2009 7:07:43 PM (15 years ago)

Author:

vboxsync

Message:

Main: Fixed assertion and double error message when cancelling a teleporter waiting for incoming connections.

File:

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

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -6762 +6762 @@
                 }
                 else if (task->mTeleporterEnabled)
+                {
                     /* -> ConsoleImplTeleporter.cpp */
                     vrc = console->teleporterTrg(pVM, pMachine, task->mStartPaused, task->mProgress);
+                    if (RT_FAILURE(vrc))
+                        rc = E_FAIL;    /* Avoid the "Missing error message..." assertion. */
+                }
                 else if (task->mStartPaused)
                     /* done */
@@ -6821 +6825 @@
             {
                 /* If the error message is not set but we've got a failure,
-                 * convert the VBox status code into a meaningfulerror message.
+                 * convert the VBox status code into a meaningful error message.
                  * This becomes unused once all the sources of errors set the
                  * appropriate error message themselves.