AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gdk-pixbuf-animation.c (gdk_pixbuf_animation_new_from_file) Avoid

Browse Source 
2004-12-27  Matthias Clasen  <mclasen@redhat.com>

	* gdk-pixbuf-animation.c (gdk_pixbuf_animation_new_from_file)
	Avoid deadlock. Pointed out by Callum McKenzie.
This commit is contained in:
Matthias Clasen 2004-12-27 22:50:45 +00:00 committed by Matthias Clasen
parent 661ec3189c
commit c0e9374d9c
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,8 @@
2004-12-27 Matthias Clasen <mclasen@redhat.com>
* gdk-pixbuf-animation.c (gdk_pixbuf_animation_new_from_file)
Avoid deadlock. Pointed out by Callum McKenzie.
Wed Dec 22 01:17:44 2004 Jonathan Blandford <jrb@redhat.com>
* queryloaders.c (main): print out the version and binary name in

6
gdk-pixbuf/gdk-pixbuf-animation.c
View File

@ -139,7 +139,7 @@ gdk_pixbuf_animation_new_from_file (const char *filename,
guchar buffer [128];
GdkPixbufModule *image_module;
gchar *display_name;
gboolean locked;
gboolean locked = FALSE;
g_return_val_if_fail (filename != NULL, NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
@ -184,8 +184,6 @@ gdk_pixbuf_animation_new_from_file (const char *filename,
return NULL;
}
locked = _gdk_pixbuf_lock (image_module);
if (image_module->load_animation == NULL) {
GdkPixbuf *pixbuf;
@ -221,6 +219,8 @@ gdk_pixbuf_animation_new_from_file (const char *filename,
g_object_unref (pixbuf);
} else {
locked = _gdk_pixbuf_lock (image_module);
fseek (f, 0, SEEK_SET);
animation = (* image_module->load_animation) (f, error);