animation: Allow prepare_func call in stop_load

Move the assertion that prepare_func was called after the stop_load
call. Makes the XPM loader not die.

https://bugzilla.gnome.org/show_bug.cgi?id=695228

1 files changed, 8 insertions, 5 deletions

diff --git a/gdk-pixbuf/gdk-pixbuf-animation.c b/gdk-pixbuf/gdk-pixbuf-animation.c
index e39a5927c..911bf41aa 100644
--- a/gdk-pixbuf/gdk-pixbuf-animation.c
+++ b/gdk-pixbuf/gdk-pixbuf-animation.c
@@ -238,8 +238,6 @@ gdk_pixbuf_animation_new_from_file (const char *filename,
                         }
                 }
 
-                /* If there was no error, there must be an animation that was successfully loaded */
-                g_assert (animation);
                 success = TRUE;
 
 fail_load_increment:
@@ -249,9 +247,14 @@ fail_load_increment:
 fail_begin_load:
 		fclose (f);
 
-                if (!success && animation) {
-                        g_object_unref (animation);
-                        animation = NULL;
+                if (success) {
+                        /* If there was no error, there must be an animation that was successfully loaded */
+                        g_assert (animation);
+                } else {
+                        if (animation) {
+                                g_object_unref (animation);
+                                animation = NULL;
+                        }
                 }
 	} else {
 		GdkPixbuf *pixbuf;