From f1c459fd6cad314f9dc015c71953de9d4f58502e Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Mon, 8 Jun 2020 20:39:12 -0700 Subject: [PATCH] Fix leak of renderer when we fail to create a GL context --- app/streaming/video/ffmpeg-renderers/eglvid.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/streaming/video/ffmpeg-renderers/eglvid.cpp b/app/streaming/video/ffmpeg-renderers/eglvid.cpp index 58bb62af..5beb2509 100644 --- a/app/streaming/video/ffmpeg-renderers/eglvid.cpp +++ b/app/streaming/video/ffmpeg-renderers/eglvid.cpp @@ -98,12 +98,13 @@ EGLRenderer::~EGLRenderer() SDL_assert(m_glDeleteVertexArraysOES != nullptr); m_glDeleteVertexArraysOES(1, &m_VAO); } - if (m_DummyRenderer) { - SDL_DestroyRenderer(m_DummyRenderer); - } SDL_GL_DeleteContext(m_Context); } + if (m_DummyRenderer) { + SDL_DestroyRenderer(m_DummyRenderer); + } + // Reset the global properties back to what they were before SDL_SetHint(SDL_HINT_OPENGL_ES_DRIVER, "0"); SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK, m_OldContextProfileMask);