Fix WxApp not being initialised correctly (#2)

Author: Crozzers

src/gui/systray.py

@@ -2,11 +2,10 @@
 from typing import Any, Callable, Optional
 
 import wx
+import wx.adv
 
 from common import local_path
 
-from .wx_app import WxApp
-
 log = logging.getLogger(__name__)
 
 MenuItem = tuple[str, Callable | 'MenuList', Optional[bool]]
@@ -43,7 +42,6 @@ def exit(self):
         if callable(self._on_exit):
             self._on_exit()
         self.RemoveIcon()
-        WxApp().ExitMainLoop()
 
     def __enter__(self):
         return self

src/gui/wx_app.py

@@ -22,9 +22,9 @@ def __init__(self):
         super().__init__()
 
     def __new__(cls, *args, **kwargs):
-        if not isinstance(getattr(cls, '__instance', None), cls):
-            cls.__instance = wx.App.__new__(cls, *args, **kwargs)
-        return cls.__instance
+        if not isinstance(getattr(cls, '_WxApp__instance', None), cls):
+            cls._WxApp__instance = wx.App.__new__(cls, *args, **kwargs)
+        return cls._WxApp__instance
 
     def OnInit(self):
         if isinstance(getattr(self, '_top_frame', None), wx.Frame):