don't HALT the active tool if it is in "preserve" mode. Fixes crashes when

2003-01-03  Michael Natterer  <mitch@gimp.org>

	* app/tools/tool_manager.c (tool_manager_image_undo_start): don't
	HALT the active tool if it is in "preserve" mode. Fixes crashes
	when e.g. the transform tool was pushing an undo group and
	implicitly HALTing itself in the middle of the transform
	operation.
This commit is contained in:
Michael Natterer 2003-01-03 17:01:55 +00:00 committed by Michael Natterer
parent 4bb66b59cc
commit 28bd9bf707
2 changed files with 11 additions and 2 deletions

View File

@ -1,3 +1,11 @@
2003-01-03 Michael Natterer <mitch@gimp.org>
* app/tools/tool_manager.c (tool_manager_image_undo_start): don't
HALT the active tool if it is in "preserve" mode. Fixes crashes
when e.g. the transform tool was pushing an undo group and
implicitly HALTing itself in the middle of the transform
operation.
2003-01-03 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpdialogfactory.c

View File

@ -761,7 +761,8 @@ tool_manager_image_undo_start (GimpImage *gimage,
tool_manager->active_tool->gdisp &&
tool_manager->active_tool->gdisp->gimage == gimage)
{
tool_manager_control_active (gimage->gimp, HALT,
tool_manager->active_tool->gdisp);
if (! gimp_tool_control_preserve (tool_manager->active_tool->control))
tool_manager_control_active (gimage->gimp, HALT,
tool_manager->active_tool->gdisp);
}
}