Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

win-capture/graphics-hook: Fix try_lock_shmem_tex mutex deadlock bug #1599

Merged
merged 1 commit into from Apr 14, 2019
Merged

Conversation

roadwy
Copy link
Contributor

@roadwy roadwy commented Jan 2, 2019

… get two mutexes,eventually may cause deadlock

if obsstudio shutdown abnormal,tex_mutexes may not be released(ReleaseMutex),at that time if use WaitForSingleObject to get mutexe WaitForSingleObject will return WAIT_ABANDONED and get lock,but try_lock_shmem_tex will not return,it will continue wait next mutexe。eventually the return WAIT_ABANDONED will not release infinite。this commit will fix this bug。

@roadwy
Copy link
Contributor Author

roadwy commented Jan 8, 2019

@DDRBoxman DDRBoxman requested a review from jp9000 February 5, 2019 20:42
It's possible that the mutexes used with shared memory capture to return
WAIT_ABANDONED if OBS is shut down abnormally while the mutex is locked.
@jp9000 jp9000 merged commit e5aa51a into obsproject:master Apr 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants