From 07a679d19e50a21f5c78f139fe8ecdddf3529788 Mon Sep 17 00:00:00 2001
From: Karishma Chadha <kchadha@scratch.mit.edu>
Date: Fri, 13 Jul 2018 12:51:32 -0400
Subject: [PATCH] Provide a from target id when sharing blocks to another
 target so that variable conflicts can be resolved.

---
 src/containers/target-pane.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/containers/target-pane.jsx b/src/containers/target-pane.jsx
index 5f9fef8db..a116b3c07 100644
--- a/src/containers/target-pane.jsx
+++ b/src/containers/target-pane.jsx
@@ -126,7 +126,7 @@ class TargetPane extends React.Component {
     }
     handleBlockDragEnd (blocks) {
         if (this.props.hoveredTarget.sprite && this.props.hoveredTarget.sprite !== this.props.editingTarget) {
-            this.props.vm.shareBlocksToTarget(blocks, this.props.hoveredTarget.sprite);
+            this.props.vm.shareBlocksToTarget(blocks, this.props.hoveredTarget.sprite, this.props.editingTarget);
             this.props.onReceivedBlocks(true);
         }
     }
-- 
GitLab