From e45cb7fac1828050feda6938d96a87fd30a6a7e3 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Mon, 9 Jan 2017 16:39:41 +0000 Subject: [PATCH] Ensure flows exist before delegating status/error events Fixes #1069 --- red/runtime/nodes/flows/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/red/runtime/nodes/flows/index.js b/red/runtime/nodes/flows/index.js index b0358235e..c06fac0e2 100644 --- a/red/runtime/nodes/flows/index.js +++ b/red/runtime/nodes/flows/index.js @@ -169,9 +169,9 @@ function getFlows() { function delegateError(node,logMessage,msg) { if (activeFlows[node.z]) { activeFlows[node.z].handleError(node,logMessage,msg); - } else if (activeNodesToFlow[node.z]) { + } else if (activeNodesToFlow[node.z] && activeFlows[activeNodesToFlow[node.z]]) { activeFlows[activeNodesToFlow[node.z]].handleError(node,logMessage,msg); - } else if (activeFlowConfig.subflows[node.z]) { + } else if (activeFlowConfig.subflows[node.z] && subflowInstanceNodeMap[node.id]) { subflowInstanceNodeMap[node.id].forEach(function(n) { delegateError(getNode(n),logMessage,msg); }); @@ -193,7 +193,7 @@ function handleError(node,logMessage,msg) { function delegateStatus(node,statusMessage) { if (activeFlows[node.z]) { activeFlows[node.z].handleStatus(node,statusMessage); - } else if (activeNodesToFlow[node.z]) { + } else if (activeNodesToFlow[node.z] && activeFlows[activeNodesToFlow[node.z]]) { activeFlows[activeNodesToFlow[node.z]].handleStatus(node,statusMessage); } }