mirror of
https://github.com/node-red/node-red
synced 2024-11-22 16:33:24 +00:00
Handle modified-nodes deploy after replacing unknown config node
Fixes #4548
This commit is contained in:
parent
9bd7131914
commit
565c212779
@ -1000,7 +1000,6 @@ RED.clipboard = (function() {
|
||||
try {
|
||||
RED.view.importNodes(newNodes, importOptions);
|
||||
} catch(error) {
|
||||
console.log(error.importConfig)
|
||||
// Thrown for import_conflict
|
||||
confirmImport(error.importConfig, newNodes, importOptions);
|
||||
}
|
||||
|
@ -374,7 +374,12 @@ async function start(type,diff,muteLog,isDeploy) {
|
||||
// A modified-type deploy means restarting things that have changed
|
||||
|
||||
// Update the global flow
|
||||
activeFlows['global'].update(activeFlowConfig,activeFlowConfig);
|
||||
if (activeFlows['global']) {
|
||||
activeFlows['global'].update(activeFlowConfig,activeFlowConfig);
|
||||
} else {
|
||||
log.debug("red/nodes/flows.start : starting flow : global");
|
||||
activeFlows['global'] = Flow.create(flowAPI,activeFlowConfig);
|
||||
}
|
||||
for (id in activeFlowConfig.flows) {
|
||||
if (activeFlowConfig.flows.hasOwnProperty(id)) {
|
||||
if (!activeFlowConfig.flows[id].disabled) {
|
||||
|
Loading…
Reference in New Issue
Block a user