diff options
| author | Neil Roberts <neil@linux.intel.com> | 2010-12-07 11:02:21 +0000 |
|---|---|---|
| committer | Neil Roberts <neil@linux.intel.com> | 2010-12-07 21:46:21 +0000 |
| commit | c0bf71f2f4b83b816b2741198b02c8f29d586e61 (patch) | |
| tree | 8a63cfb3c4e4ce640008aec951f7bb578c6d97ba | |
| parent | e140b8279085fcfa39d3c7cdfca4820778ef24b9 (diff) | |
| download | clutter-c0bf71f2f4b83b816b2741198b02c8f29d586e61.tar.gz | |
clutter-score: Initialize ClutterScoreEntry::complete_id
When clutter_score_append_at_marker is called instead of
clutter_score_append the complete_id field of ClutterScoreEntry was
being left uninitialised. When the entry is eventually freed it would
sometimes try to disconnect an invalid signal id. This was causing
conformance test failures for me on GLES2.
(cherry picked from commit f8fc194b3b3529bf4f3230cef00d5d0b042673bf)
| -rw-r--r-- | clutter/clutter-score.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/clutter/clutter-score.c b/clutter/clutter-score.c index b2ef2f243..14182c03f 100644 --- a/clutter/clutter-score.c +++ b/clutter/clutter-score.c @@ -990,6 +990,7 @@ clutter_score_append_at_marker (ClutterScore *score, entry->marker = g_strdup (marker_name); entry->id = priv->last_id; entry->score = score; + entry->complete_id = 0; marker_reached_signal = g_strdup_printf ("marker-reached::%s", marker_name); entry->marker_id = g_signal_connect (entry->parent, |