[clutter] Fix calculation of duration for ClutterState default transitions
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter] Fix calculation of duration for ClutterState default transitions
- Date: Mon, 19 Sep 2011 17:36:05 +0000 (UTC)
commit fcc2ab7be594427c0dd2b0570a67ae9c555f1f40
Author: Craig R. Hughes <craig git rungie com>
Date: Mon Sep 19 09:30:00 2011 -0700
Fix calculation of duration for ClutterState default transitions
https://bugzilla.gnome.org/show_bug.cgi?id=659200
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 236ca90..adb80a4 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));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]