# HG changeset patch # User etisserant # Date 1219680109 -7200 # Node ID ad3292145fc29caeb98af925950f5b1a623876ee # Parent 43d65f0179e24bdd8dfa8e23377287d1f83cb58d Fixed local PLC runtime kill on aborted quit attempt. diff -r 43d65f0179e2 -r ad3292145fc2 Beremiz.py --- a/Beremiz.py Mon Aug 25 18:01:01 2008 +0200 +++ b/Beremiz.py Mon Aug 25 18:01:49 2008 +0200 @@ -409,10 +409,6 @@ (int(last_line), int(last_column))) def OnCloseFrame(self, event): - # shutdown local runtime - self.local_runtime.kill(SIGKILL) - # clear temp dir - shutil.rmtree(self.local_runtime_tmpdir) if self.PluginRoot.HasProjectOpened(): if self.PluginRoot.ProjectTestModified(): @@ -425,13 +421,18 @@ if answer == wx.ID_YES: self.PluginRoot.SaveProject() event.Skip() - return elif answer == wx.ID_NO: event.Skip() return else: event.Veto() return + + # shutdown local runtime + self.local_runtime.kill(SIGKILL) + # clear temp dir + shutil.rmtree(self.local_runtime_tmpdir) + event.Skip() def OnMoveWindow(self, event):