From 589c07c1ad93cdf3ca8c492b951b1ef1e4cd9cf6 Mon Sep 17 00:00:00 2001 From: lifujun <814084764@qq.com> Date: Thu, 18 Jun 2020 10:32:52 +0800 Subject: [PATCH] fix(GLRender): null point crash --- framework/render/video/glRender/GLRender.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/framework/render/video/glRender/GLRender.cpp b/framework/render/video/glRender/GLRender.cpp index fbb8b57e0..a58ba5a02 100644 --- a/framework/render/video/glRender/GLRender.cpp +++ b/framework/render/video/glRender/GLRender.cpp @@ -263,7 +263,11 @@ int GLRender::VSyncOnInit() void GLRender::VSyncOnDestroy() { mPrograms.clear(); - assert(mContext != nullptr); + + if(mContext == nullptr) { + return; + } + mContext->DestroyView(); mContext->DestroySurface(mGLSurface); mGLSurface = nullptr; @@ -274,6 +278,10 @@ void GLRender::VSyncOnDestroy() bool GLRender::renderActually() { + if(mContext == nullptr) { + return false; + } + if (mInBackground) { // AF_LOGD("renderActurally .. InBackground .."); return false; @@ -293,7 +301,7 @@ bool GLRender::renderActually() } #endif - assert(mContext != nullptr); + bool displayViewChanged = false; { unique_lock viewLock(mViewMutex);