Mercurial Mercurial > beremiz / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | bz2 | zip | gz | help
Enure that all threads are joined before trying to exit fix_PLC_runtime_shutdown
authorEdouard Tisserant
Thu, 18 Apr 2019 14:29:55 +0200
branchfix_PLC_runtime_shutdown
changeset 2601 9c5b20dc2b2e
parent 2600 0e20a0d48fae
child 2602 19dc6b830e7d
Enure that all threads are joined before trying to exit
Beremiz_service.py file | annotate | diff | comparison | revisions 
--- a/Beremiz_service.py	Wed Apr 17 14:18:22 2019 +0200
+++ b/Beremiz_service.py	Thu Apr 18 14:29:55 2019 +0200
@@ -582,6 +582,7 @@
     pass
 
 pyroserver.Quit()
+pyro_thread.join()
 
 plcobj = runtime.GetPLCObjectSingleton()
 plcobj.StopPLC()
@@ -589,7 +590,9 @@
 
 if havetwisted:
     reactor.stop()
+    ui_thread.join()
 elif havewx:
     app.ExitMainLoop()
+    ui_thread.join()
 
 sys.exit(0)
beremiz