* app/tools/gimprectangleselecttool.c: don't autoshrink when
	there is no display; fixes crash reported by Carol.
This commit is contained in:
William Skaggs
2006-06-12 22:17:52 +00:00
parent 131aad120c
commit 354d247c67
2 changed files with 14 additions and 3 deletions

View File

@ -1,4 +1,9 @@
2006-06-11 Bill Skaggs <weskaggs@primate.ucdavis.edu>
2006-06-12 Bill Skaggs <weskaggs@primate.ucdavis.edu>
* app/tools/gimprectangleselecttool.c: don't autoshrink when
there is no display; fixes crash reported by Carol.
2006-06-12 Bill Skaggs <weskaggs@primate.ucdavis.edu>
* app/tools/gimprectangleselecttool.c
* app/tools/gimprectangletool.c: fix three issues identified by

View File

@ -688,8 +688,8 @@ gimp_rect_select_tool_auto_shrink (GimpRectSelectTool *rect_select)
GimpRectangleTool *rectangle = GIMP_RECTANGLE_TOOL (rect_select);
GimpTool *tool = GIMP_TOOL (rect_select);
GimpDisplay *display = GIMP_TOOL (rect_select)->display;
gint width = display->image->width;
gint height = display->image->height;
gint width;
gint height;
gint offset_x = 0;
gint offset_y = 0;
gint rx1, ry1;
@ -702,6 +702,12 @@ gimp_rect_select_tool_auto_shrink (GimpRectSelectTool *rect_select)
gint shrunk_y2;
gboolean shrink_merged;
if (! display)
return;
width = display->image->width;
height = display->image->height;
g_object_get (GIMP_SELECTION_OPTIONS (tool->tool_info->tool_options),
"shrink-merged", &shrink_merged,
NULL);