Skip to content

Commit 1ca5867

Browse files
authored
TizenRendererEvasGL: Add nullcheck for evas_gl_ (#320)
DestorySurface is called more than once depending on the situation. Add nullcheck to avoid destroying already destroyed evas_gl_ again.
1 parent 6c699b2 commit 1ca5867

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

shell/platform/tizen/tizen_renderer_evas_gl.cc

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,18 @@ bool TizenRendererEvasGL::CreateSurface(void* render_target,
8585
}
8686

8787
void TizenRendererEvasGL::DestroySurface() {
88-
evas_gl_surface_destroy(evas_gl_, gl_surface_);
89-
evas_gl_surface_destroy(evas_gl_, gl_resource_surface_);
88+
if (evas_gl_) {
89+
evas_gl_surface_destroy(evas_gl_, gl_surface_);
90+
evas_gl_surface_destroy(evas_gl_, gl_resource_surface_);
9091

91-
evas_gl_context_destroy(evas_gl_, gl_context_);
92-
evas_gl_context_destroy(evas_gl_, gl_resource_context_);
92+
evas_gl_context_destroy(evas_gl_, gl_context_);
93+
evas_gl_context_destroy(evas_gl_, gl_resource_context_);
9394

94-
evas_gl_config_free(gl_config_);
95-
evas_gl_free(evas_gl_);
95+
evas_gl_config_free(gl_config_);
96+
evas_gl_free(evas_gl_);
97+
98+
evas_gl_ = nullptr;
99+
}
96100
}
97101

98102
bool TizenRendererEvasGL::OnMakeCurrent() {

0 commit comments

Comments
 (0)