Commit 14ca490c authored by Remi Perenon's avatar Remi Perenon
Browse files

Merge branch 'release-1.3.x'

parents e4e15758 b40a953c
Pipeline #7168 passed with stages
in 37 minutes and 53 seconds
version 1.3.1
--------------
* FIXED issue #46 There was an error message when closign converter plugins. The error is no more here but the converter still does not close.
version 1.3.0 version 1.3.0
-------------- --------------
* ADDED Neutron Dynamic Total Structure Factor analysis * ADDED Neutron Dynamic Total Structure Factor analysis
......
...@@ -151,9 +151,12 @@ class JobPlugin(ComponentPlugin): ...@@ -151,9 +151,12 @@ class JobPlugin(ComponentPlugin):
PUBLISHER.sendMessage("msg_set_data", message=self) PUBLISHER.sendMessage("msg_set_data", message=self)
def on_close(self, event): def on_close(self, event):
try:
self.parent.mgr.ClosePane(self.parent.mgr.GetPane(self)) self.parent.mgr.ClosePane(self.parent.mgr.GetPane(self))
except AttributeError:
# If the job is a converter, the parent has no mgr attribute
pass
class JobFrame(wx.Frame): class JobFrame(wx.Frame):
def __init__(self, parent, jobType, datakey=None): def __init__(self, parent, jobType, datakey=None):
......
...@@ -39,9 +39,9 @@ __repo__ = "https://code.ill.fr/scientific-software/mdanse/" ...@@ -39,9 +39,9 @@ __repo__ = "https://code.ill.fr/scientific-software/mdanse/"
__license__ = "GPL 3" __license__ = "GPL 3"
__version__ = "1.3.0" __version__ = "1.3.1"
__date__ = "07-02-2019" __date__ = "21-05-2019"
__commit__ = "undefined" __commit__ = "undefined"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment