diff options
author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2014-12-09 20:13:39 +0100 |
---|---|---|
committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2014-12-09 20:13:39 +0100 |
commit | 1016fb64de716587f12997cf48bcfb739b4c5bda (patch) | |
tree | 9ea21b06f95f6cbffe90071b10774f0659bf596d | |
parent | a144087085e217008d371e8b8a58d9b25415ff84 (diff) |
mir: return proper surface / connection only when valid, without failing
-rw-r--r-- | cogl/winsys/cogl-winsys-egl-mir.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cogl/winsys/cogl-winsys-egl-mir.c b/cogl/winsys/cogl-winsys-egl-mir.c index 86c30a3f..bc6b6bcf 100644 --- a/cogl/winsys/cogl-winsys-egl-mir.c +++ b/cogl/winsys/cogl-winsys-egl-mir.c @@ -691,7 +691,9 @@ cogl_mir_renderer_get_connection (CoglRenderer *renderer) { CoglRendererEGL *egl_renderer = renderer->winsys; CoglRendererMir *mir_renderer = egl_renderer->platform; - return mir_renderer->mir_connection; + + if (mir_connection_is_valid (mir_renderer->mir_connection)) + return mir_renderer->mir_connection; } return NULL; @@ -729,9 +731,10 @@ cogl_mir_onscreen_get_surface (CoglOnscreen *onscreen) egl_onscreen = onscreen->winsys; mir_onscreen = egl_onscreen->platform; - _COGL_RETURN_VAL_IF_FAIL (mir_surface_is_valid (mir_onscreen->mir_surface), NULL); + if (mir_surface_is_valid (mir_onscreen->mir_surface)) + return mir_onscreen->mir_surface; - return mir_onscreen->mir_surface; + return NULL; } void |