summaryrefslogtreecommitdiff
path: root/gdk-pixbuf/gdk-pixbuf-loader.c
diff options
context:
space:
mode:
authorMatthias Clasen <matthiasc@src.gnome.org>2008-09-05 01:01:22 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2008-09-05 01:01:22 +0000
commit51d80a5fe14c7e7631612fc61bfd8cba9c335984 (patch)
tree2ba46555d44639384a2408031382c5c166895b27 /gdk-pixbuf/gdk-pixbuf-loader.c
parent620ca1f67fc5f8f09c10830624b62e9d93ad6059 (diff)
downloadgdk-pixbuf-51d80a5fe14c7e7631612fc61bfd8cba9c335984.tar.gz
Fix a deadlock in pixbuf loader initialization
svn path=/trunk/; revision=21295
Diffstat (limited to 'gdk-pixbuf/gdk-pixbuf-loader.c')
-rw-r--r--gdk-pixbuf/gdk-pixbuf-loader.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/gdk-pixbuf/gdk-pixbuf-loader.c b/gdk-pixbuf/gdk-pixbuf-loader.c
index c01e7fd32..ce6dc411d 100644
--- a/gdk-pixbuf/gdk-pixbuf-loader.c
+++ b/gdk-pixbuf/gdk-pixbuf-loader.c
@@ -356,9 +356,8 @@ gdk_pixbuf_loader_load_module (GdkPixbufLoader *loader,
if (priv->image_module == NULL)
return 0;
- if (priv->image_module->module == NULL)
- if (!_gdk_pixbuf_load_module (priv->image_module, error))
- return 0;
+ if (!_gdk_pixbuf_load_module (priv->image_module, error))
+ return 0;
if (priv->image_module->module == NULL)
return 0;