summaryrefslogtreecommitdiff
path: root/gdk/x11/gdkimage-x11.c
diff options
context:
space:
mode:
authorSven Neumann <sven@gimp.org>2002-01-29 11:47:15 +0000
committerSven Neumann <neo@src.gnome.org>2002-01-29 11:47:15 +0000
commit2c0e16e403110949b7f377ba85d198b0d44e910b (patch)
tree965b2de691ad8cc501979a11d3dedab75fe7eff7 /gdk/x11/gdkimage-x11.c
parentc8a1ae5bce1297a23590f2bce2286a9e41beb6cf (diff)
downloadgtk+-2c0e16e403110949b7f377ba85d198b0d44e910b.tar.gz
fixed a segfault that showed up when using the color picker.
2002-01-29 Sven Neumann <sven@gimp.org> * gdk/x11/gdkimage-x11.c (_gdk_x11_copy_to_image): fixed a segfault that showed up when using the color picker.
Diffstat (limited to 'gdk/x11/gdkimage-x11.c')
-rw-r--r--gdk/x11/gdkimage-x11.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gdk/x11/gdkimage-x11.c b/gdk/x11/gdkimage-x11.c
index 4f03ff8de3..1ce5ca1d8a 100644
--- a/gdk/x11/gdkimage-x11.c
+++ b/gdk/x11/gdkimage-x11.c
@@ -584,8 +584,6 @@ _gdk_x11_copy_to_image (GdkDrawable *drawable,
if (!gdk_rectangle_intersect (&req, &window_rect, &req))
goto out;
- private = PRIVATE_DATA (image);
-
gdk_error_trap_push ();
if (!image &&
@@ -606,6 +604,8 @@ _gdk_x11_copy_to_image (GdkDrawable *drawable,
created_image = TRUE;
}
+ private = PRIVATE_DATA (image);
+
/* In the ShmImage but no ShmPixmap case, we could use XShmGetImage when
* we are getting the entire image.
*/