diff --git a/ChangeLog b/ChangeLog
index 004227e043..e5d212be05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-17  Julien MOUTTE  <julien@moutte.net>
+
+	* sys/ximage/ximagesink.c: (gst_ximagesink_expose): Checking if the
+	pad is negotiating before trying renegotiation.
+
 2004-02-17  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* ext/gdk_pixbuf/gstgdkpixbuf.c: (gst_gdk_pixbuf_type_find):
diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c
index 4f61ae629f..d5e977330d 100644
--- a/sys/ximage/ximagesink.c
+++ b/sys/ximage/ximagesink.c
@@ -1253,7 +1253,8 @@ gst_ximagesink_expose (GstXOverlay *overlay)
   if (attr.width == 1 && attr.height == 1)
     return;
   
-  if (gst_pad_is_negotiated (GST_VIDEOSINK_PAD (ximagesink)))
+  if (gst_pad_is_negotiated (GST_VIDEOSINK_PAD (ximagesink)) &&
+      !GST_PAD_IS_NEGOTIATING (GST_VIDEOSINK_PAD (ximagesink)))
     gst_ximagesink_renegotiate_size (ximagesink, attr.width, attr.height);
   
   gst_ximagesink_xwindow_clear (ximagesink, ximagesink->xwindow);