Browse Source

Fix spurious responder wait generation.

This fixes an issue in which responders would get "stuck" at the end if
the last message had callbacks AND the responder was not attached to a
Python node.
pull/156/head
Adam Johnson 5 years ago
parent
commit
9dbd66204d
Signed by: Hoikas
GPG Key ID: 0B6515D6FF6F271E
  1. 10
      korman/nodes/node_responder.py

10
korman/nodes/node_responder.py

@ -263,12 +263,9 @@ class PlasmaResponderStateNode(PlasmaNodeBase, bpy.types.Node):
def add_waitable_node(self, node): def add_waitable_node(self, node):
self.waitable_nodes.append(node) self.waitable_nodes.append(node)
def ensure_last_wait(self, exporter, so, force=False): def ensure_last_wait(self, exporter, so):
if self.waitable_nodes: if self.waitable_nodes:
lastWaitNode = self.waitable_nodes[-1] return self.find_create_wait(exporter, so, self.waitable_nodes[-1])
lastMsgNode = self.commands[-1][0]
if lastMsgNode == lastWaitNode or force:
return self.find_create_wait(exporter, so, lastWaitNode)
return -1 return -1
def find_create_wait(self, exporter, so, node): def find_create_wait(self, exporter, so, node):
@ -298,7 +295,8 @@ class PlasmaResponderStateNode(PlasmaNodeBase, bpy.types.Node):
# Imaging a responder that sends only one animation command message, for example. # Imaging a responder that sends only one animation command message, for example.
# That means a wait will not be set up for that command due to no child linkage. # That means a wait will not be set up for that command due to no child linkage.
# However, the PFM notification below expects a wait for stuff like that. # However, the PFM notification below expects a wait for stuff like that.
lastWait = commands.ensure_last_wait(exporter, so, force=stateMgr.has_pfm) if stateMgr.has_pfm:
lastWait = commands.ensure_last_wait(exporter, so)
# This commits the responder commands to the responder. Needs to happen before we # This commits the responder commands to the responder. Needs to happen before we
# add the PFM notification directly to the responder. # add the PFM notification directly to the responder.

Loading…
Cancel
Save