brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not try to unref NULL CoglObjects

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=765058
This commit is contained in:
Florian Müllner 2016-04-14 16:21:35 +02:00
parent 588b8a163b
commit bdc72dd9d7
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backends/meta-cursor.c
View File

@ -159,7 +159,9 @@ meta_cursor_sprite_load_from_xcursor_image (MetaCursorSprite *self,
NULL);
meta_cursor_sprite_set_texture (self, texture,
xc_image->xhot, xc_image->yhot);
cogl_object_unref (texture);
if (texture)
cogl_object_unref (texture);
meta_cursor_renderer_realize_cursor_from_xcursor (renderer, self, xc_image);
}

3
src/compositor/meta-surface-actor-x11.c
View File

@ -102,8 +102,7 @@ detach_pixmap (MetaSurfaceActorX11 *self)
priv->pixmap = None;
meta_error_trap_pop (display);
cogl_object_unref (priv->texture);
priv->texture = NULL;
g_clear_pointer (&priv->texture, cogl_object_unref);
}
static void