diff options
| author | Ray Strode <rstrode@redhat.com> | 2013-03-25 17:24:01 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2013-03-26 13:47:09 -0400 |
| commit | 6e393c8b79c5ef9848285367c5ab7b1c9ba72432 (patch) | |
| tree | 568bc4dd45943f86bd833ab8841b6015013b3abc | |
| parent | 2177450b1b105574aa40c15f938060b307a2e3c0 (diff) | |
| download | mutter-wip/bg-fixes.tar.gz | |
background: don't tank if background is destroyed before it gets a pipelinewip/bg-fixes
Right now we call unset_texture from MetaBackground's dispose method.
unset_texture assumes there's a pipeline available, but there may not
be if the object was just created.
This commit fixes that incorrect assumption.
https://bugzilla.gnome.org/show_bug.cgi?id=696157
| -rw-r--r-- | src/compositor/meta-background.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compositor/meta-background.c b/src/compositor/meta-background.c index 3380957ee..d15b06cd9 100644 --- a/src/compositor/meta-background.c +++ b/src/compositor/meta-background.c @@ -704,7 +704,8 @@ static void unset_texture (MetaBackground *self) { MetaBackgroundPrivate *priv = self->priv; - cogl_pipeline_set_layer_texture (priv->pipeline, 0, NULL); + if (priv->pipeline != NULL) + cogl_pipeline_set_layer_texture (priv->pipeline, 0, NULL); g_clear_pointer (&priv->texture, (GDestroyNotify) |