From fcc2ab7be594427c0dd2b0570a67ae9c555f1f40 Mon Sep 17 00:00:00 2001 From: "Craig R. Hughes" Date: Mon, 19 Sep 2011 09:30:00 -0700 Subject: [PATCH] Fix calculation of duration for ClutterState default transitions https://bugzilla.gnome.org/show_bug.cgi?id=659200 --- clutter/clutter-state.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/clutter/clutter-state.c b/clutter/clutter-state.c index 236ca9075..adb80a454 100644 --- a/clutter/clutter-state.c +++ b/clutter/clutter-state.c @@ -1969,8 +1969,13 @@ clutter_state_get_duration (ClutterState *state, if (target_state != NULL) { if (source_state_name) - ret = GPOINTER_TO_INT (g_hash_table_lookup (target_state->durations, - source_state_name)); + { + ret = GPOINTER_TO_INT (g_hash_table_lookup (target_state->durations, + source_state_name)); + if(!ret) + ret = GPOINTER_TO_INT (g_hash_table_lookup (target_state->durations, + NULL)); + } else ret = GPOINTER_TO_INT (g_hash_table_lookup (target_state->durations, NULL));