dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #3263: fix critical error on bucket fill tool. 

Fixes the error:
> Critical error: gimp_line_art_thaw: assertion 'line_art->priv->frozen'

This may happen in cases when we didn't actually freeze the line art at
pointer click, because we were in an invalid case (for instance,
clicking out of selection), hence we must not thaw the line art either
at button release.
This commit is contained in:
Jehan 2019-08-27 12:41:49 +02:00
parent 72d865daa0
commit 6391b2bcff
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/core/gimplineart.c
View File

@ -538,6 +538,12 @@ gimp_line_art_thaw (GimpLineArt *line_art)
}
}
gboolean
gimp_line_art_is_frozen (GimpLineArt *line_art)
{
return line_art->priv->frozen;
}
GeglBuffer *
gimp_line_art_get (GimpLineArt *line_art,
gfloat **distmap)

1
app/core/gimplineart.h
View File

@ -65,6 +65,7 @@ void gimp_line_art_set_input (GimpLineArt *line_art,
GimpPickable * gimp_line_art_get_input (GimpLineArt *line_art);
void gimp_line_art_freeze (GimpLineArt *line_art);
void gimp_line_art_thaw (GimpLineArt *line_art);
gboolean gimp_line_art_is_frozen (GimpLineArt *line_art);
GeglBuffer * gimp_line_art_get (GimpLineArt *line_art,
gfloat **distmap);

3
app/tools/gimpbucketfilltool.c
View File

@ -420,7 +420,8 @@ gimp_bucket_fill_tool_halt (GimpBucketFillTool *tool)
g_clear_object (&tool->priv->fill_mask);
gimp_line_art_thaw (tool->priv->line_art);
if (gimp_line_art_is_frozen (tool->priv->line_art))
gimp_line_art_thaw (tool->priv->line_art);
GIMP_TOOL (tool)->display = NULL;
GIMP_TOOL (tool)->drawable = NULL;