diff options
| author | Craig R. Hughes <craig.git@rungie.com> | 2011-09-19 09:30:00 -0700 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@linux.intel.com> | 2011-09-19 18:29:39 +0100 |
| commit | fcc2ab7be594427c0dd2b0570a67ae9c555f1f40 (patch) | |
| tree | 3334053c1bebed851e8662fb3aa3140c8fcbcf72 /clutter | |
| parent | 14bd6eaad4672ce488986aa2609a5c0ad69adc2b (diff) | |
| download | clutter-fcc2ab7be594427c0dd2b0570a67ae9c555f1f40.tar.gz | |
Fix calculation of duration for ClutterState default transitions
https://bugzilla.gnome.org/show_bug.cgi?id=659200
Diffstat (limited to 'clutter')
| -rw-r--r-- | clutter/clutter-state.c | 9 |
1 files 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)); |