Skip to content

libobs: Make sure all code paths leave context #13375

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.

Sign up for GitHub

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

Open
suogesi wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −2
Open

libobs: Make sure all code paths leave context #13375

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions libobs/obs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -645,10 +645,14 @@ static int obs_init_video_mix(struct obs_video_info *ovi, struct obs_core_video_

gs_enter_context(obs->video.graphics);

if (video->gpu_conversion && !obs_init_gpu_conversion(video))
if (video->gpu_conversion && !obs_init_gpu_conversion(video)) {
gs_leave_context();
return OBS_VIDEO_FAIL;
if (!obs_init_textures(video))
}
if (!obs_init_textures(video)) {
gs_leave_context();
return OBS_VIDEO_FAIL;
}

gs_leave_context();

Expand Down
Loading