Fix situation where skilled router could get stuck expecting messages

dream/simulation/Machine.py

@@ -1226,14 +1226,15 @@ class Machine(CoreObject):
             operator.unAssign()     # set the flag operatorAssignedTo to None
             operator.workingStation=None
             self.outputTrace(operator.name, "released from "+ self.objName)
+            self.toBeOperated = False
         # if the Router is expecting for signal send it
         from Globals import G
         from SkilledOperatorRouter import SkilledRouter
-            self.toBeOperated = False
         if G.RouterList[0].__class__ is SkilledRouter:
             if G.RouterList[0].expectedFinishSignals:
                 if self.id in G.RouterList[0].expectedFinishSignalsDict:
                     signal=G.RouterList[0].expectedFinishSignalsDict[self.id]
+                    if not signal.triggered:
                         self.sendSignal(receiver=G.RouterList[0], signal=signal)
         self.broker.invokeType='release'
         self.broker.invoke()

dream/simulation/SkilledOperatorRouter.py

@@ -444,7 +444,7 @@ class SkilledRouter(Router):
                                 station=findObjectById(solution[id])
                                 signal=True                                       
                                 # signal only the stations in the original list
-                                if station not in self.toBeSignalled:
+                                if station not in self.toBeSignalled or (not operator.onShift) or operator.onBreak:
                                     signal=False
                                 # signal only if the operator is free 
                                 if operator.workingStation:
@@ -455,7 +455,6 @@ class SkilledRouter(Router):
                                     # signal the station so that it gets the operator
                                     self.signalStation(station, operator)
 
-            
             #===================================================================
             # default behaviour
             #===================================================================