Changeset 59856 in vbox

Timestamp:

Feb 26, 2016 3:47:54 PM (9 years ago)

Author:

vboxsync

Message:

DnD: HostServices/DragAndDrop/service.cpp: Cancel deferred client returns if they're in a wrong state when issuing a new host command.

File:

• trunk/src/VBox/HostServices/DragAndDrop/service.cpp (modified) (2 diffs)

trunk/src/VBox/HostServices/DragAndDrop/service.cpp

@@ -1242 +1242 @@
                     /* Note: Report the current rc back to the guest. */
                     pClient->completeDeferred(rc);
-
-                    m_clientQueue.pop_front();
                 }
                 /*
@@ -1256 +1254 @@
                     pClient->completeDeferred(rc);
                 }
-                else /* Should not happen. */
-                    AssertMsgFailed(("Client ID=%RU32 in wrong state with uMsg=%RU32 (next message in queue: %RU32)\n",
-                                     pClient->clientId(), uMsgClient, uMsgNext));
+                else /* Should not happen; cancel the operation on the guest. */
+                {
+                    LogFunc(("Client ID=%RU32 in wrong state with uMsg=%RU32 (next message in queue: %RU32), cancelling\n",
+                             pClient->clientId(), uMsgClient, uMsgNext));
+
+                    pClient->completeDeferred(VERR_CANCELLED);
+                }
+
+                m_clientQueue.pop_front();
             }