Index: /trunk/src/VBox/HostServices/GuestControl/service.cpp
===================================================================
--- /trunk/src/VBox/HostServices/GuestControl/service.cpp	(revision 45415)
+++ /trunk/src/VBox/HostServices/GuestControl/service.cpp	(revision 45416)
@@ -474,6 +474,6 @@
 {
     ClientState(void)
-        : mID(0),
-          mSvcHelpers(NULL),
+        : mSvcHelpers(NULL),
+          mID(0),
           mFlags(0), mContextFilter(0),
           mHostCmdRc(VINF_SUCCESS), mHostCmdTries(0),
@@ -482,6 +482,6 @@
 
     ClientState(PVBOXHGCMSVCHELPERS pSvcHelpers, uint32_t uClientID)
-        : mID(uClientID),
-          mSvcHelpers(pSvcHelpers),
+        : mSvcHelpers(pSvcHelpers),
+          mID(uClientID),
           mFlags(0), mContextFilter(0),
           mHostCmdRc(VINF_SUCCESS), mHostCmdTries(0),
@@ -501,21 +501,4 @@
         if (curCmd != mHostCmdList.end())
             Dequeue(curCmd);
-    }
-
-    void Dequeue(HostCommand *pHostCmd)
-    {
-        AssertPtrReturnVoid(pHostCmd);
-
-        HostCmdListIter curItem = mHostCmdList.begin();
-        while (curItem != mHostCmdList.end())
-        {
-            if ((*curItem) == pHostCmd)
-            {
-                Dequeue(curItem);
-                break;
-            }
-
-            curItem++;
-        }
     }
 
@@ -679,5 +662,18 @@
 
         if (fRemove)
-            Dequeue(pHostCmd);
+        {
+            /** @todo Fix this (slow) lookup. Too late today. */
+            HostCmdListIter curItem = mHostCmdList.begin();
+            while (curItem != mHostCmdList.end())
+            {
+                if ((*curItem) == pHostCmd)
+                {
+                    Dequeue(curItem);
+                    break;
+                }
+
+                curItem++;
+            }
+        }
 
         LogFlowFunc(("[Client %RU32] Returned with rc=%Rrc\n", mID, rc));