Skip to content

Commit

Permalink
Run custOutput conditions after decConCount
Browse files Browse the repository at this point in the history
  • Loading branch information
TeamSpen210 committed Dec 23, 2015
1 parent 575e12a commit c973a66
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/conditions.py
Original file line number Diff line number Diff line change
Expand Up @@ -1972,10 +1972,6 @@ def res_cust_output(inst, res):
inp=deact_inp,
targ=con_inst['targetname'],
))

if targ_conditions:
for cond in targ_conditions: # type: Condition
cond.test(con_inst)
if dec_con_count and 'connectioncount' in con_inst.fixup:
# decrease ConnectionCount on the ents,
# so they can still process normal inputs
Expand All @@ -1989,6 +1985,10 @@ def res_cust_output(inst, res):
' has invalid ConnectionCount!'
)

if targ_conditions:
for cond in targ_conditions: # type: Condition
cond.test(con_inst)

if outputs:
for targ in targets:
for out in outputs:
Expand Down

0 comments on commit c973a66

Please sign in to comment.