UnInit auimanagers when exiting app

Thiago Franco de Moraes
1 parent 6b54118d
Showing 2 changed files with 12 additions and 1 deletions Show diff stats
invesalius/gui/default_viewers.py
invesalius/gui/frame.py
@@ -43,6 +43,7 @@ class Panel(wx.Panel):
         self.__init_aui_manager()
         self.__bind_events_wx()
+        self.__bind_events()
         #self.__init_four_way_splitter()
         #self.__init_mix()
@@ -124,6 +125,9 @@ class Panel(wx.Panel):
         self.aui_manager.Bind(wx.aui.EVT_AUI_PANE_MAXIMIZE, self.OnMaximize)
         self.aui_manager.Bind(wx.aui.EVT_AUI_PANE_RESTORE, self.OnRestore)
+    def __bind_events(self):
+        Publisher.subscribe(self._Exit, 'Exit')
+
     def OnMaximize(self, evt):
         if evt.GetPane().name == self.s4.name:
             Publisher.sendMessage('Show raycasting widget', None)
@@ -152,6 +156,8 @@ class Panel(wx.Panel):
         p4 = volume_viewer.Viewer(self)
         splitter.AppendWindow(p4)
+    def _Exit(self, pubsub_evt):
+        self.aui_manager.UnInit()
     def __init_mix(self):
         aui_manager = wx.aui.AuiManager()
@@ -246,6 +252,7 @@ class VolumeInteraction(wx.Panel):
                                 'Refresh raycasting widget points')
         Publisher.subscribe(self.LoadHistogram,
                                 'Load histogram')
+        Publisher.subscribe(self._Exit, 'Exit')
     def __update_curve_wwwl_text(self, curve):
         ww, wl = self.clut_raycasting.GetCurveWWWl(curve)
@@ -299,6 +306,10 @@ class VolumeInteraction(wx.Panel):
         self.clut_raycasting.CalculatePixelPoints()
         self.clut_raycasting.Refresh()
+    def _Exit(self, pubsub_evt):
+        self.aui_manager.UnInit()
+
+
 import wx.lib.platebtn as pbtn
 import wx.lib.buttons as btn
 import wx.lib.pubsub as ps
@@ -270,6 +270,7 @@ class Frame(wx.Frame):
         """
         Exit InVesalius.
         """
+        self.aui_manager.UnInit()
         self.Destroy()
         if hasattr(sys,"frozen") and sys.platform == 'darwin':
             sys.exit(0)
@@ -392,7 +393,6 @@ class Frame(wx.Frame):
         s = ses.Session()
         if not s.IsOpen() or not s.project_path:
             Publisher.sendMessage('Exit')
-        self.aui_manager.UnInit()
     def OnMenuClick(self, evt):
         """