Two little bugfixes:

-- Double-click was not working correctly in the Key Select dialog, and
therefore wasn't making it into binds correctly.  Fixed.

(Use KeySelectDialog self.Keymap correctly in OnMouseEvent.)

-- After loading an existing profile (except during initial startup), or
creating a new one, keybind conflict checking would silently stop
working.

(Always use wx.App.Get().Main.Profile, instead of wx.App.Get().Profile,
if getting the profile that way.)

BindControl.py

@@ -600,12 +600,11 @@ def OnInit(self):
 
         self.Init()
         self.Main = Main(None)
-        self.Profile = self.Main.Profile
 
         # TODO bootstrapping problem, can't do this inside Profile's "__init__" because
         # Profile needs to be defined/initialized deep inside its innards.
-        if self.Profile:
-            self.Profile.CheckAllConflicts()
+        if self.Main.Profile:
+            self.Main.Profile.CheckAllConflicts()
 
         self.Main.Show()
 

UI/KeySelectDialog.py

@@ -329,7 +329,7 @@ def buildBind(self):
         self.Layout()
 
     def CheckConflicts(self):
-        Profile = wx.App.Get().Profile
+        Profile = wx.App.Get().Main.Profile
         if Profile:
             conflicts = self.Button.CheckConflicts(self.Binding)
             if conflicts:
@@ -508,7 +508,7 @@ def __init__(self, parent, id, init = {}):
         self.Bind(EVT_KEY_CHANGED, self.onKeyChanged)
 
     def onKeyChanged(self, _):
-        wx.App.Get().Profile.CheckAllConflicts()
+        wx.App.Get().Main.Profile.CheckAllConflicts()
 
     def ClearButton(self, _):
         self.SetLabel("")
@@ -537,7 +537,7 @@ def SetLabel(self, label):
         self.SetLabelMarkup(label)
 
     def CheckConflicts(self, newbinding = None):
-        Profile = wx.App.Get().Profile
+        Profile = wx.App.Get().Main.Profile
         if Profile:
             conflicts = Profile.CheckConflict(newbinding or self.Key, self.CtlName)
             if conflicts:
@@ -551,7 +551,7 @@ def CheckConflicts(self, newbinding = None):
 
     def KeySelectEventHandler(self, evt):
         button = evt.EventObject
-        Profile = wx.App.Get().Profile
+        Profile = wx.App.Get().Main.Profile
 
         existingKey = button.Key
 

UI/PowerBinderDialog.py

@@ -214,7 +214,7 @@ def PowerBinderEventHandler(self, _):
             bindString = dlg.MakeBindString()
             if bindString != self.tgtTxtCtrl.GetValue():
                 self.tgtTxtCtrl.SetValue(bindString)
-                wx.App.Get().Profile.SetModified()
+                wx.App.Get().Main.Profile.SetModified()
 
     def LoadFromData(self, data):
         self.PowerBinderDialog().LoadFromData(data)
@@ -513,7 +513,7 @@ def BuildUI(self, dialog):
         return groupSizer
 
     def CalculateValue(self):
-        page = wx.App.Get().Profile.CustomBinds
+        page = wx.App.Get().Main.Profile.CustomBinds
 
         total = 0
 
@@ -1437,7 +1437,7 @@ def BuildUI(self, dialog):
         sizer.Add(self.CommandChoice, 0, wx.ALL, 5)
 
         self.FilePath = wx.TextCtrl(dialog, -1, size = (400, -1),
-            value = str(wx.App.Get().Profile.GameBindsDir() / 'windows.txt'))
+            value = str(wx.App.Get().Main.Profile.GameBindsDir() / 'windows.txt'))
         sizer.Add(self.FilePath, 0, wx.ALL, 5)
 
         return sizer

UI/SimpleBindPane.py

@@ -105,7 +105,7 @@ def PopulateBindFiles(self):
         if not self.checkIfWellFormed():
             wx.MessageBox(f"Custom Bind \"{self.Title}\" is not complete or has errors.  Not written to bindfile.")
             return
-        resetfile = wx.App.Get().Profile.ResetFile()
+        resetfile = wx.App.Get().Main.Profile.ResetFile()
         bk = self.Ctrls[self.MakeCtlName('BindKey')]
         bc = self.Ctrls[self.MakeCtlName('BindContents')]