1 files changed, 12 insertions, 3 deletions
diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibCrOgl.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibCrOgl.cpp
index 3fa03d20..893b4718 100644
--- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibCrOgl.cpp
+++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibCrOgl.cpp
@@ -91,9 +91,18 @@ DECLVBGL(int) vboxCrCtlConConnect(HVBOXCRCTL hCtl, uint32_t *pu32ClientID)
     RTStrCopy(info.Loc.u.host.achName, sizeof (info.Loc.u.host.achName), "VBoxSharedCrOpenGL");
     rc = vbglDriverIOCtl (&hCtl->driver, VBOXGUEST_IOCTL_HGCM_CONNECT, &info, sizeof (info));
     if (RT_SUCCESS(rc))
-        *pu32ClientID = info.u32ClientID;
-    else
-        *pu32ClientID = 0;
+    {
+        rc = info.result;
+        if (RT_SUCCESS(rc))
+        {
+            Assert(info.u32ClientID);
+            *pu32ClientID = info.u32ClientID;
+            return rc;
+        }
+    }
+
+    Assert(RT_FAILURE(rc));
+    *pu32ClientID = 0;
     return rc;
 }