mirror of
https://gitlab.gnome.org/GNOME/eog
synced 2024-10-18 14:04:27 +00:00
don't stomp on an already set GError. Fixes bug #320342.
2005-11-09 Paolo Borelli <pborelli@katamail.com> * libeog/eog-image.c (eog_image_real_load): don't stomp on an already set GError. Fixes bug #320342.
This commit is contained in:
parent
26e4e628b7
commit
e22cfa75a0
|
@ -1,3 +1,8 @@
|
|||
2005-11-09 Paolo Borelli <pborelli@katamail.com>
|
||||
|
||||
* libeog/eog-image.c (eog_image_real_load): don't stomp on an
|
||||
already set GError. Fixes bug #320342.
|
||||
|
||||
2005-11-09 Lucas Rocha <lucasr@cvs.gnome.org>
|
||||
|
||||
* shell/eog-window.c (delete_image_real, show_delete_confirm_dialog):
|
||||
|
|
|
@ -797,10 +797,14 @@ eog_image_real_load (EogImage *img, guint data2read, EogJob *job, GError **error
|
|||
}
|
||||
}
|
||||
|
||||
if (!gdk_pixbuf_loader_close (loader, error)) {
|
||||
/* if we already failed ignore errors on close */
|
||||
if (failed) {
|
||||
gdk_pixbuf_loader_close (loader, NULL);
|
||||
}
|
||||
else if (!gdk_pixbuf_loader_close (loader, error)) {
|
||||
failed = TRUE;
|
||||
}
|
||||
|
||||
|
||||
g_free (buffer);
|
||||
gnome_vfs_close (handle);
|
||||
|
||||
|
|
Loading…
Reference in a new issue