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

clutter/transition: Do not call methods of a NULL ClutterAnimatable

Browse Source 
Only call clutter_animatable_get_actor on a non-null object, otherwise set
the timeline actor to NULL directly.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3750>
This commit is contained in:
Corentin Noël
2024-05-14 15:43:52 +02:00
committed by Marge Bot
parent 1f1538be76
commit 0ab5ff6eed
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
clutter/clutter/clutter-transition.c
View File

@@ -355,7 +355,7 @@ clutter_transition_set_animatable (ClutterTransition *transition,
ClutterAnimatable *animatable) ClutterAnimatable *animatable)
{ {
ClutterTransitionPrivate *priv; ClutterTransitionPrivate *priv;
ClutterActor *actor; ClutterActor *actor = NULL;
g_return_if_fail (CLUTTER_IS_TRANSITION (transition)); g_return_if_fail (CLUTTER_IS_TRANSITION (transition));
g_return_if_fail (animatable == NULL || CLUTTER_IS_ANIMATABLE (animatable)); g_return_if_fail (animatable == NULL || CLUTTER_IS_ANIMATABLE (animatable));
@@ -374,9 +374,9 @@ clutter_transition_set_animatable (ClutterTransition *transition,
{ {
priv->animatable = g_object_ref (animatable); priv->animatable = g_object_ref (animatable);
clutter_transition_attach (transition, priv->animatable); clutter_transition_attach (transition, priv->animatable);
actor = clutter_animatable_get_actor (animatable);
} }
actor = clutter_animatable_get_actor (animatable);
clutter_timeline_set_actor (CLUTTER_TIMELINE (transition), actor); clutter_timeline_set_actor (CLUTTER_TIMELINE (transition), actor);
} }