From 19df7c6835f3a4097ee88c94daf78561f615a714 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 4 Oct 2019 19:44:24 +0200 Subject: [PATCH] Bug Fixed when trying to run a session with no process runing --- FloatingSpace/StrategyPart.js | 4 ++++ .../Workspace/FunctionLibraries/SessionFunctions.js | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/FloatingSpace/StrategyPart.js b/FloatingSpace/StrategyPart.js index 3b6bebdaf..fdac1cac7 100644 --- a/FloatingSpace/StrategyPart.js +++ b/FloatingSpace/StrategyPart.js @@ -19,6 +19,7 @@ function newStrategyPart () { circularProgressBar: undefined, isExecuting: undefined, isDefault: undefined, + isRunning: undefined, setAsDefault: setAsDefault, run: run, stop: stop, @@ -618,6 +619,8 @@ function newStrategyPart () { type: 'Secondary Action Already Executed' } stop(callBackFunction, event) + + thisObject.isRunning = true } function stop (callBackFunction, event) { @@ -634,6 +637,7 @@ function newStrategyPart () { thisObject.circularProgressBar.finalize() thisObject.circularProgressBar = undefined } + thisObject.isRunning = false } } diff --git a/StrategySpace/Workspace/FunctionLibraries/SessionFunctions.js b/StrategySpace/Workspace/FunctionLibraries/SessionFunctions.js index 90a380e9f..01537425a 100644 --- a/StrategySpace/Workspace/FunctionLibraries/SessionFunctions.js +++ b/StrategySpace/Workspace/FunctionLibraries/SessionFunctions.js @@ -7,6 +7,17 @@ function newSessionFunctions () { return thisObject function runSession (node, functionLibraryProtocolNode, callBackFunction) { + /* We can not run a sessionif its parent process is not running. Less if it does not have a parent. */ + if (node.payload.parentNode === undefined) { + callBackFunction(GLOBAL.DEFAULT_FAIL_RESPONSE) + return + } + + if (node.payload.parentNode.payload.uiObject.isRunning !== true) { + callBackFunction(GLOBAL.DEFAULT_FAIL_RESPONSE) + return + } + node.payload.uiObject.run(callBackFunction) let key = node.name + '-' + node.type + '-' + node.id