[gimp/gimp-2-8] Bug 711476 - Problems using animated GIH brushes
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gimp-2-8] Bug 711476 - Problems using animated GIH brushes
- Date: Sat, 16 Nov 2013 07:54:58 +0000 (UTC)
commit c7bb77c45d51964e1eec7420b4b2ca1e9667cfb9
Author: Michael Natterer <mitch gimp org>
Date: Sat Nov 16 08:51:25 2013 +0100
Bug 711476 - Problems using animated GIH brushes
Show the error message from gimp_brush_load_brush() instead of
a generic "File is corrupt". Doesn't fix anything.
(cherry picked from commit 3e711fec092d88a2cd69f335b461d1e3a3a5f368)
app/core/gimpbrushpipe-load.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/app/core/gimpbrushpipe-load.c b/app/core/gimpbrushpipe-load.c
index 56a3b6d..0607b1d 100644
--- a/app/core/gimpbrushpipe-load.c
+++ b/app/core/gimpbrushpipe-load.c
@@ -210,8 +210,11 @@ gimp_brush_pipe_load (GimpContext *context,
while (pipe->n_brushes < num_of_brushes)
{
+ GError *my_error = NULL;
+
pipe->brushes[pipe->n_brushes] = gimp_brush_load_brush (context,
- fd, filename, NULL);
+ fd, filename,
+ &my_error);
if (pipe->brushes[pipe->n_brushes])
{
@@ -220,10 +223,7 @@ gimp_brush_pipe_load (GimpContext *context,
}
else
{
- g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
- _("Fatal parse error in brush file '%s': "
- "File is corrupt."),
- gimp_filename_to_utf8 (filename));
+ g_propagate_error (error, my_error);
close (fd);
g_object_unref (pipe);
return NULL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]