gimp r27117 - in trunk: . app/display

[neo svn gnome org]

Author: neo
Date: Fri Oct  3 19:20:46 2008
New Revision: 27117
URL: http://svn.gnome.org/viewvc/gimp?rev=27117&view=rev

Log:
2008-10-03  Sven Neumann  <sven gimp org>

	* app/display/gimpdisplayshell-scale.c
	(gimp_display_shell_scale_update_scrollbars)
	(gimp_display_shell_scale_update_rulers): bail out early if
	shell->display is NULL. Fixes crash reported on the 
mailing-list.



Modified:
   trunk/ChangeLog
   trunk/app/display/gimpdisplayshell-scale.c

Modified: trunk/app/display/gimpdisplayshell-scale.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-scale.c	(original)
+++ trunk/app/display/gimpdisplayshell-scale.c	Fri Oct  3 19:20:46 2008
@@ -90,9 +90,6 @@
 {
   g_return_if_fail (GIMP_IS_DISPLAY_SHELL (shell));
 
-  if (! shell->display)
-    return;
-
   gimp_display_shell_scale_update_scrollbars (shell);
   gimp_display_shell_scale_update_rulers (shell);
 }
@@ -109,6 +106,9 @@
   gint       image_width;
   gint       image_height;
 
+  if (! shell->display)
+    return;
+
   image = shell->display->image;
 
   if (image)
@@ -165,6 +165,9 @@
   gint       scaled_viewport_offset_x;
   gint       scaled_viewport_offset_y;
 
+  if (! shell->display)
+    return;
+
   image = shell->display->image;
 
   if (image)