Merge pull request #2637 from komoto48g/fix-it

Fix InspectionTool crashes due to bad perspective string errros
wxWidgets · Nov 7, 2024 · 41823e3 · 41823e3
2 parents 74f2381 + ba0e6b0
commit 41823e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/wx/lib/agw/aui/framemanager.py b/wx/lib/agw/aui/framemanager.py
@@ -5178,7 +5178,7 @@ def LoadPaneInfo(self, pane_part, pane):
             elif val_name == "transparent":
                 pane.transparent = int(value)
             else:
-                raise Exception("Bad perspective string")
+                raise Exception("Bad perspective string", val_name)
 
         # replace escaped characters so we can
         # split up the string easily

diff --git a/wx/lib/inspection.py b/wx/lib/inspection.py
@@ -405,11 +405,11 @@ def LoadSettings(self, config):
         rect = utils.AdjustRectToScreen(self.GetRect())
         self.SetRect(rect)
 
-        perspective = config.Read('perspective', '')
+        perspective = config.Read('perspective1', '')
         if perspective:
             try:
                 self.mgr.LoadPerspective(perspective)
-            except wx.PyAssertionError:
+            except Exception:
                 # ignore bad perspective string errors
                 pass
         self.includeSizers = config.ReadBool('includeSizers', False)
@@ -430,7 +430,7 @@ def SaveSettings(self, config):
 
         if hasattr(self, "mgr"):
             perspective = self.mgr.SavePerspective()
-            config.Write('perspective', perspective)
+            config.Write('perspective1', perspective)
             config.WriteBool('includeSizers', self.includeSizers)
 
 #---------------------------------------------------------------------------