diff --git a/ChangeLog b/ChangeLog
index c2941c588c..8bfe77b34c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-09-16  Michael Natterer  <mitch@gimp.org>
+
+	* app/tools/gimpperspectiveclonetool.c (button_press)
+	* app/tools/gimpsourcetool.c (button_press): need to instruct the
+	paint_core to make a copy of the projection whenever we clone from
+	the same *image*, not from the same display. Fixes crash when
+	cloning from the same image's projection in another view
+	(bug #356209).
+
 2006-09-15  Bill Skaggs  <weskaggs@primate.ucdavis.edu>
 
 	* plug-ins/common/screenshot.c: when shooting a region, apply delay
diff --git a/app/tools/gimpperspectiveclonetool.c b/app/tools/gimpperspectiveclonetool.c
index dae9c37075..c961cd3fe4 100644
--- a/app/tools/gimpperspectiveclonetool.c
+++ b/app/tools/gimpperspectiveclonetool.c
@@ -348,7 +348,8 @@ gimp_perspective_clone_tool_button_press (GimpTool        *tool,
 
           if (GIMP_CLONE_OPTIONS (options)->clone_type == GIMP_IMAGE_CLONE  &&
               GIMP_SOURCE_OPTIONS (options)->sample_merged                  &&
-              display == clone_tool->src_display)
+              clone_tool->src_display                                       &&
+              clone_tool->src_display->image == display->image)
             {
               paint_tool->core->use_saved_proj = TRUE;
             }
diff --git a/app/tools/gimpsourcetool.c b/app/tools/gimpsourcetool.c
index cc15b7dd6d..ac02631075 100644
--- a/app/tools/gimpsourcetool.c
+++ b/app/tools/gimpsourcetool.c
@@ -191,9 +191,10 @@ gimp_source_tool_button_press (GimpTool        *tool,
     {
       source->set_source = FALSE;
 
-      if (options->use_source    &&
-          options->sample_merged &&
-          display == source_tool->src_display)
+      if (options->use_source      &&
+          options->sample_merged   &&
+          source_tool->src_display &&
+          source_tool->src_display->image && display->image)
         {
           paint_tool->core->use_saved_proj = TRUE;
         }