diff --git a/ChartingSpace/TimeMachine.js b/ChartingSpace/TimeMachine.js index d11bacf51..948938cd1 100644 --- a/ChartingSpace/TimeMachine.js +++ b/ChartingSpace/TimeMachine.js @@ -528,6 +528,8 @@ function newTimeMachine () { } function draw () { + if (thisObject.payload === undefined) { return } + if (thisObject.payload.node === undefined) { return } if (thisObject.container.frame.isInViewPort()) { for (let i = 0; i < thisObject.timelineCharts.length; i++) { let timelineChart = thisObject.timelineCharts[thisObject.timelineCharts.length - i - 1] diff --git a/DesignSpace/Workspace/Workspace.js b/DesignSpace/Workspace/Workspace.js index d061988c8..e9075d8a7 100644 --- a/DesignSpace/Workspace/Workspace.js +++ b/DesignSpace/Workspace/Workspace.js @@ -182,9 +182,23 @@ function newWorkspace () { if (rootNode.networkNodes !== undefined) { for (let j = 0; j < rootNode.networkNodes.length; j++) { let networkNode = rootNode.networkNodes[j] - for (let i = 0; i < networkNode.taskManagers.length; i++) { - let taskManager = networkNode.taskManagers[i] - taskManager.payload.uiObject.menu.internalClick('Stop All Tasks') + if (networkNode.dataMining !== undefined) { + for (let i = 0; i < networkNode.dataMining.taskManagers.length; i++) { + let taskManager = networkNode.dataMining.taskManagers[i] + taskManager.payload.uiObject.menu.internalClick('Stop All Tasks') + } + } + if (networkNode.testingEnvironment !== undefined) { + for (let i = 0; i < networkNode.testingEnvironment.taskManagers.length; i++) { + let taskManager = networkNode.testingEnvironment.taskManagers[i] + taskManager.payload.uiObject.menu.internalClick('Stop All Tasks') + } + } + if (networkNode.productionEnvironment !== undefined) { + for (let i = 0; i < networkNode.productionEnvironment.taskManagers.length; i++) { + let taskManager = networkNode.productionEnvironment.taskManagers[i] + taskManager.payload.uiObject.menu.internalClick('Stop All Tasks') + } } } }