From e5e3c8c65dc12fe838f647dd8f21f16f10aa1e43 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sun, 3 Jun 2007 21:46:04 +0000 Subject: [PATCH] check for errors even if the loader_func returned something so we display 2007-06-03 Michael Natterer * app/core/gimpdatafactory.c (gimp_data_factory_load_data): check for errors even if the loader_func returned something so we display errors from partially loaded files which contain multiple data items. svn path=/trunk/; revision=22696 --- ChangeLog | 7 +++++++ app/core/gimpdatafactory.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 137587f188..2963c152b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-06-03 Michael Natterer + + * app/core/gimpdatafactory.c (gimp_data_factory_load_data): check + for errors even if the loader_func returned something so we + display errors from partially loaded files which contain multiple + data items. + 2007-06-03 Michael Natterer * libgimpwidgets/gimpcolorscale.c: let mouse button 1 jump to the diff --git a/app/core/gimpdatafactory.c b/app/core/gimpdatafactory.c index 7533257eab..3b972d7caa 100644 --- a/app/core/gimpdatafactory.c +++ b/app/core/gimpdatafactory.c @@ -721,7 +721,8 @@ gimp_data_factory_load_data (const GimpDatafileData *file_data, g_list_free (data_list); } - else + + if (G_UNLIKELY (error)) { gimp_message (factory->gimp, NULL, GIMP_MESSAGE_ERROR, _("Failed to load data:\n\n%s"), error->message);