brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

st: Don't assert when corner texture creation fails

Browse Source
This commit is contained in:
Florian Müllner 2016-04-15 19:05:04 +02:00
parent 63f6ff9151
commit 8416ba25de
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/st/st-theme-node-drawing.c
View File

@ -182,7 +182,6 @@ create_corner_material (StCornerSpec *corner)
} }
g_free (data); g_free (data);
g_assert (texture != COGL_INVALID_HANDLE);
return texture; return texture;
} }
@ -355,7 +354,7 @@ st_theme_node_lookup_corner (StThemeNode *node,
float height, float height,
StCorner corner_id) StCorner corner_id)
{ {
CoglHandle texture, material; CoglHandle texture, material = COGL_INVALID_HANDLE;
char *key; char *key;
StTextureCache *cache; StTextureCache *cache;
StCornerSpec corner; StCornerSpec corner;
@ -404,8 +403,12 @@ st_theme_node_lookup_corner (StThemeNode *node,
key = corner_to_string (&corner); key = corner_to_string (&corner);
texture = st_texture_cache_load (cache, key, ST_TEXTURE_CACHE_POLICY_NONE, load_corner, &corner, NULL); texture = st_texture_cache_load (cache, key, ST_TEXTURE_CACHE_POLICY_NONE, load_corner, &corner, NULL);
material = _st_create_texture_pipeline (texture);
cogl_handle_unref (texture); if (texture)
{
material = _st_create_texture_pipeline (texture);
cogl_handle_unref (texture);
}
g_free (key); g_free (key);