3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-06-10 23:01:59 +02:00
Code Issues Projects Releases Packages Wiki Activity

[core] Node: fix locked issue when computation is canceled

Browse source
This commit is contained in:
Julien-Haudegond 2020-09-04 16:31:58 +02:00
parent 37c758c8da
commit 0693af58c1
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
meshroom/core/node.py
View file

@ -878,11 +878,19 @@ class BaseNode(BaseObject):
lockedStatus = (Status.RUNNING, Status.SUBMITTED) lockedStatus = (Status.RUNNING, Status.SUBMITTED)
# Unlock required nodes if the current node changes to Error, Stopped or None # Unlock required nodes if the current node changes to Error, Stopped or None
if self.locked and currentStatus in (Status.ERROR, Status.STOPPED, Status.NONE): # Warning: we must handle some specific cases for global start/stop
if self._locked and currentStatus in (Status.ERROR, Status.STOPPED, Status.NONE):
self.setLocked(False) self.setLocked(False)
inputNodes = self.getInputNodes(recursive=True) inputNodes = self.getInputNodes(recursive=True)
for node in inputNodes:
if node.getGlobalStatus() == Status.RUNNING:
# Return without unlocking if at least one input node is running
# Example: using Cancel Computation on a submitted node
return
for node in inputNodes: for node in inputNodes:
node.setLocked(False) node.setLocked(False)
return
# Avoid useless travel through nodes # Avoid useless travel through nodes
# For instance: when loading a scene with successful nodes # For instance: when loading a scene with successful nodes