beremiz

Fixed remaining thread on close frame

2009-12-06, Edouard TISSERANT
11263fd24566
Parents 67d32a91d70b
Children 11638e373a65
Fixed remaining thread on close frame
2 files changed, 13 insertions(+), 11 deletions(-)
  • +1 -0
    Beremiz.py
  • +12 -11
    plugger.py
    • --- a/Beremiz.py Sun Dec 06 22:52:51 2009 +0100
    +++ b/Beremiz.py Sun Dec 06 23:05:47 2009 +0100
    @@ -517,6 +517,7 @@
    def OnCloseFrame(self, event):
    if self.PluginRoot is None or self.CheckSaveBeforeClosing(_("Close Application")):
    self.KillLocalRuntime()
    + self.PluginRoot.KillDebugThread()
    event.Skip()
    else:
    event.Veto()
    --- a/plugger.py Sun Dec 06 22:52:51 2009 +0100
    +++ b/plugger.py Sun Dec 06 23:05:47 2009 +0100
    @@ -755,7 +755,6 @@
    self.SetAppFrame(frame, logger)
    self._builder = None
    self._connector = None
    - self.Deleting = False
    self.iec2c_path = os.path.join(base_folder, "matiec", "iec2c"+exe_ext)
    self.ieclib_path = os.path.join(base_folder, "matiec", "lib")
    @@ -788,7 +787,9 @@
    self.LoadSTLibrary()
    def __del__(self):
    - self.Deleting = True
    + if self.DebugTimer:
    + self.DebugTimer.cancel()
    + self.KillDebugThread()
    def SetAppFrame(self, frame, logger):
    self.AppFrame = frame
    @@ -1614,12 +1615,11 @@
    if self.DebugTimer is not None:
    self.DebugTimer.cancel()
    - if not self.Deleting:
    - # Timer to prevent rapid-fire when registering many variables
    - # use wx.CallAfter use keep using same thread. TODO : use wx.Timer instead
    - self.DebugTimer=Timer(0.5,wx.CallAfter,args = [self.RegisterDebugVarToConnector])
    - # Rearm anti-rapid-fire timer
    - self.DebugTimer.start()
    + # Timer to prevent rapid-fire when registering many variables
    + # use wx.CallAfter use keep using same thread. TODO : use wx.Timer instead
    + self.DebugTimer=Timer(0.5,wx.CallAfter,args = [self.RegisterDebugVarToConnector])
    + # Rearm anti-rapid-fire timer
    + self.DebugTimer.start()
    def GetDebugIECVariableType(self, IECPath):
    Idx, IEC_Type = self._IECPathToIdx.get(IECPath,(None,None))
    @@ -1725,9 +1725,10 @@
    def KillDebugThread(self):
    self.debug_break = True
    - self.DebugThread.join(timeout=1)
    - if self.DebugThread.isAlive():
    - self.logger.write_warning(_("Debug Thread couldn't be killed"))
    + if self.DebugThread is not None:
    + self.DebugThread.join(timeout=1)
    + if self.DebugThread.isAlive() and self.logger:
    + self.logger.write_warning(_("Debug Thread couldn't be killed"))
    self.DebugThread = None
    def _connect_debug(self):