From 560d76ab3645adbafa894f4da6ce7bb4ee643e19 Mon Sep 17 00:00:00 2001 From: JunsuChoi Date: Fri, 22 Jul 2022 13:45:19 +0900 Subject: [PATCH] TizenRendererEvasGL: Add nullcheck for evas_gl_ DestorySurface is called more than once depending on the situation. Add nullcheck to avoid destroying already destroyed evas_gl_ again. --- shell/platform/tizen/tizen_renderer_evas_gl.cc | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/shell/platform/tizen/tizen_renderer_evas_gl.cc b/shell/platform/tizen/tizen_renderer_evas_gl.cc index ae94366454e83..4289fa0ef9995 100644 --- a/shell/platform/tizen/tizen_renderer_evas_gl.cc +++ b/shell/platform/tizen/tizen_renderer_evas_gl.cc @@ -82,14 +82,18 @@ bool TizenRendererEvasGL::CreateSurface(void* render_target, } void TizenRendererEvasGL::DestroySurface() { - evas_gl_surface_destroy(evas_gl_, gl_surface_); - evas_gl_surface_destroy(evas_gl_, gl_resource_surface_); + if (evas_gl_) { + evas_gl_surface_destroy(evas_gl_, gl_surface_); + evas_gl_surface_destroy(evas_gl_, gl_resource_surface_); - evas_gl_context_destroy(evas_gl_, gl_context_); - evas_gl_context_destroy(evas_gl_, gl_resource_context_); + evas_gl_context_destroy(evas_gl_, gl_context_); + evas_gl_context_destroy(evas_gl_, gl_resource_context_); - evas_gl_config_free(gl_config_); - evas_gl_free(evas_gl_); + evas_gl_config_free(gl_config_); + evas_gl_free(evas_gl_); + + evas_gl_ = nullptr; + } } bool TizenRendererEvasGL::OnMakeCurrent() {