HALT the tool with the right display. Fixes some random tool crashes.

2003-10-06  Michael Natterer  <mitch@gimp.org>

	* app/tools/tool_manager.c (tool_manager_image_undo_start): HALT
	the tool with the right display. Fixes some random tool crashes.
This commit is contained in:
Michael Natterer 2003-10-06 11:07:10 +00:00 committed by Michael Natterer
parent 035d1e6506
commit afc58a660c
2 changed files with 7 additions and 5 deletions

View File

@ -1,3 +1,8 @@
2003-10-06 Michael Natterer <mitch@gimp.org>
* app/tools/tool_manager.c (tool_manager_image_undo_start): HALT
the tool with the right display. Fixes some random tool crashes.
2003-10-06 Sven Neumann <sven@gimp.org> 2003-10-06 Sven Neumann <sven@gimp.org>
* app/widgets/gimpdnd.c (gimp_dnd_data_drop_handle): check for * app/widgets/gimpdnd.c (gimp_dnd_data_drop_handle): check for

View File

@ -247,9 +247,7 @@ tool_manager_control_active (Gimp *gimp,
(GIMP_IS_DRAW_TOOL (tool_manager->active_tool) && (GIMP_IS_DRAW_TOOL (tool_manager->active_tool) &&
GIMP_DRAW_TOOL (tool_manager->active_tool)->gdisp == gdisp))) GIMP_DRAW_TOOL (tool_manager->active_tool)->gdisp == gdisp)))
{ {
gimp_tool_control (tool_manager->active_tool, gimp_tool_control (tool_manager->active_tool, action, gdisp);
action,
gdisp);
} }
else if (action == HALT) else if (action == HALT)
{ {
@ -557,7 +555,6 @@ tool_manager_image_undo_start (GimpImage *gimage,
gdisp = GIMP_DRAW_TOOL (tool_manager->active_tool)->gdisp; gdisp = GIMP_DRAW_TOOL (tool_manager->active_tool)->gdisp;
if (gdisp && gdisp->gimage == gimage) if (gdisp && gdisp->gimage == gimage)
tool_manager_control_active (gimage->gimp, HALT, tool_manager_control_active (gimage->gimp, HALT, gdisp);
tool_manager->active_tool->gdisp);
} }
} }