diff --git a/ChangeLog b/ChangeLog
index fab2726195..dc6208aa35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov 29 23:43:15 MET 1999  Sven Neumann <sven@gimp.org>
+	
+	* app/layers_dialog.c: 
+	get rid of the "gdisplays_flush() called recursively." warning
+
 1999-11-27  Michael Natterer  <mitch@gimp.org>
 
 	* app/preferances_dialog.c: oops, all frames said "General" after
diff --git a/app/gui/layers-dialog.c b/app/gui/layers-dialog.c
index e472c02c01..89b24c8238 100644
--- a/app/gui/layers-dialog.c
+++ b/app/gui/layers-dialog.c
@@ -598,6 +598,9 @@ layers_dialog_flush (void)
   if (!layersD || !(gimage = layersD->gimage))
     return;
 
+  /*  Make sure the gimage is not notified of this change  */
+  suspend_gimage_notify++;
+
   /*  Check if the gimage extents have changed  */
   if ((gimage->width != layersD->gimage_width) ||
       (gimage->height != layersD->gimage_height))
@@ -665,6 +668,8 @@ layers_dialog_flush (void)
 
   gtk_container_foreach (GTK_CONTAINER (layersD->layer_list),
 			 layer_widget_layer_flush, NULL);
+
+  suspend_gimage_notify--;
 }
 
 void
diff --git a/app/layers_dialog.c b/app/layers_dialog.c
index e472c02c01..89b24c8238 100644
--- a/app/layers_dialog.c
+++ b/app/layers_dialog.c
@@ -598,6 +598,9 @@ layers_dialog_flush (void)
   if (!layersD || !(gimage = layersD->gimage))
     return;
 
+  /*  Make sure the gimage is not notified of this change  */
+  suspend_gimage_notify++;
+
   /*  Check if the gimage extents have changed  */
   if ((gimage->width != layersD->gimage_width) ||
       (gimage->height != layersD->gimage_height))
@@ -665,6 +668,8 @@ layers_dialog_flush (void)
 
   gtk_container_foreach (GTK_CONTAINER (layersD->layer_list),
 			 layer_widget_layer_flush, NULL);
+
+  suspend_gimage_notify--;
 }
 
 void