sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

mir: return proper surface / connection only when valid, without failing

Browse source
This commit is contained in:
Marco Trevisan (Treviño) 2014-12-09 20:13:39 +01:00
parent a144087085
commit 1016fb64de
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cogl/winsys/cogl-winsys-egl-mir.c
View file

@ -691,7 +691,9 @@ cogl_mir_renderer_get_connection (CoglRenderer *renderer)
{ {
CoglRendererEGL *egl_renderer = renderer->winsys; CoglRendererEGL *egl_renderer = renderer->winsys;
CoglRendererMir *mir_renderer = egl_renderer->platform; 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; return NULL;
@ -729,9 +731,10 @@ cogl_mir_onscreen_get_surface (CoglOnscreen *onscreen)
egl_onscreen = onscreen->winsys; egl_onscreen = onscreen->winsys;
mir_onscreen = egl_onscreen->platform; 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 void