From 6a208ed215aa3d75e8034d6906c98c99c69a02fa Mon Sep 17 00:00:00 2001 From: Xaymar Date: Sun, 22 Oct 2017 18:56:41 +0200 Subject: [PATCH] gs: Leave GS context and then return texture This fixes a hang when calling GetTextureObject() on a GS::RenderTarget. --- source/gs-rendertarget.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/gs-rendertarget.cpp b/source/gs-rendertarget.cpp index dcaf4fd..c1174bc 100644 --- a/source/gs-rendertarget.cpp +++ b/source/gs-rendertarget.cpp @@ -44,8 +44,9 @@ GS::RenderTargetOp GS::RenderTarget::Render(uint32_t width, uint32_t height) { gs_texture_t* GS::RenderTarget::GetTextureObject() { obs_enter_graphics(); - return gs_texrender_get_texture(m_renderTarget); + gs_texture_t* tex = gs_texrender_get_texture(m_renderTarget); obs_leave_graphics(); + return tex; } GS::RenderTargetOp::RenderTargetOp(GS::RenderTarget* rt, uint32_t width, uint32_t height) : m_renderTarget(rt) {