From d3d9533493f9d0229675295fe50ee665fad77ded Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Tue, 12 Mar 2019 14:25:36 +0000
Subject: [PATCH] Search subflows instances when looking for given node id

---
 .../@node-red/runtime/lib/nodes/flows/Flow.js     | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/runtime/lib/nodes/flows/Flow.js b/packages/node_modules/@node-red/runtime/lib/nodes/flows/Flow.js
index 1e3352717..a8ecf35a6 100644
--- a/packages/node_modules/@node-red/runtime/lib/nodes/flows/Flow.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/flows/Flow.js
@@ -176,9 +176,9 @@ class Flow {
                                 subflowDefinition,
                                 node
                             );
+                            this.subflowInstanceNodes[id] = subflow;
                             subflow.start();
                             this.activeNodes[id] = subflow.node;
-                            this.subflowInstanceNodes[id] = subflow;
 
                             // this.subflowInstanceNodes[id] = nodes.map(function(n) { return n.id});
                             // for (var i=0;i<nodes.length;i++) {
@@ -313,6 +313,19 @@ class Flow {
         } else if (this.activeNodes[id]) {
             // TEMP: this is a subflow internal node within this flow
             return this.activeNodes[id];
+        } else {
+            // The node could be inside one of this flow's subflows
+            var node;
+            for (var sfId in this.subflowInstanceNodes) {
+                if (this.subflowInstanceNodes.hasOwnProperty(sfId)) {
+                    node = this.subflowInstanceNodes[sfId].getNode(id,cancelBubble);
+                    if (node) {
+                        return node;
+                    }
+                }
+            }
+
+
         }
         if (!cancelBubble) {
             return this.parent.getNode(id);