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

app: Iscissors: don't crash when cancelling the initial point

This commit is contained in:
Michael Natterer 2015-03-28 21:52:26 +01:00
parent 4842e2a14f
commit bd75ed6bf0
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/tools/gimpiscissorstool.c
View File

@ -683,9 +683,6 @@ gimp_iscissors_tool_button_release (GimpTool *tool,
switch (iscissors->state)
{
case SEED_PLACEMENT:
gimp_iscissors_tool_pop_undo (iscissors);
break;
case SEED_ADJUSTMENT:
gimp_iscissors_tool_pop_undo (iscissors);
break;
@ -695,7 +692,10 @@ gimp_iscissors_tool_button_release (GimpTool *tool,
}
}
iscissors->state = WAITING;
if (iscissors->curve->first_point)
iscissors->state = NO_ACTION;
else
iscissors->state = WAITING;
gimp_draw_tool_resume (GIMP_DRAW_TOOL (tool));
@ -1187,6 +1187,13 @@ gimp_iscissors_tool_pop_undo (GimpIscissorsTool *iscissors)
iscissors->undo_stack = g_list_remove (iscissors->undo_stack,
iscissors->curve);
if (! iscissors->undo_stack)
{
iscissors->state = NO_ACTION;
gimp_draw_tool_stop (GIMP_DRAW_TOOL (iscissors));
}
}
static void