beremiz

Python Runtime: fix StopPLC timeout if twisted and wxpython enabled

15 months ago, Edouard Tisserant
24365756503e
Parents 00ef78dffbf6
Children a1965cb0da9b
Python Runtime: fix StopPLC timeout if twisted and wxpython enabled
1 files changed, 7 insertions(+), 1 deletions(-)
  • +7 -1
    runtime/PLCObject.py
    • --- a/runtime/PLCObject.py Thu Mar 13 13:15:05 2025 +0100
    +++ b/runtime/PLCObject.py Mon Mar 17 13:28:06 2025 +0100
    @@ -566,14 +566,20 @@
    self._fail(_("Problem starting PLC : error %d" % res))
    @RunInMain
    - def StopPLC(self):
    + def StopPLCLoop(self):
    if self.PLCStatus == PlcStatus.Started:
    self.LogMessage("PLC stopped")
    self._stopPLC()
    if self.TraceThread is not None:
    self.TraceThread.join()
    self.TraceThread = None
    + return True
    + return False
    + # Does not @RunInMain since python runtime Stop call must run in
    + # main thread, and StopPLC waits for it to complete
    + def StopPLC(self):
    + if self.StopPLCLoop():
    # Wait for python runtime stop to complete
    if self.PlcStopped.wait(timeout=5):
    self.PLCStatus = PlcStatus.Stopped