Changeset 51534 in vbox for trunk/src/VBox

Timestamp:

Jun 4, 2014 3:46:56 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

94173

Message:

main/crOpenGL: fix racing

File:

• trunk/src/VBox/Main/src-client/DisplayImpl.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -4815 +4815 @@
 int Display::crCtlSubmitSyncIfHasDataForScreen(uint32_t u32ScreenID, struct VBOXCRCMDCTL* pCmd, uint32_t cbCmd)
 {
-    if (mCrOglCallbacks.pfnHasDataForScreen(u32ScreenID))
-        return crCtlSubmitSync(pCmd, cbCmd);
-
-    return crCtlSubmitAsyncCmdCopy(pCmd, cbCmd);
+    int rc = RTCritSectRwEnterShared(&mCrOglLock);
+    AssertRCReturn(rc, rc);
+
+    if (mCrOglCallbacks.pfnHasDataForScreen && mCrOglCallbacks.pfnHasDataForScreen(u32ScreenID))
+        rc = crCtlSubmitSync(pCmd, cbCmd);
+    else
+        rc = crCtlSubmitAsyncCmdCopy(pCmd, cbCmd);
+
+    RTCritSectRwLeaveShared(&mCrOglLock);
+
+    return rc;
 }