Skip to content

Commit c5a9397

Browse files
Fix crash while closing (#1255)
If a world was open and amulet was closed while on the main menu the app would crash.
1 parent 3ceb0d4 commit c5a9397

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

amulet_map_editor/api/framework/amulet_ui.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,17 +202,20 @@ def _on_page_closing(self, evt: flatnotebook.EVT_FLATNOTEBOOK_PAGE_CLOSING):
202202
evt.Veto()
203203

204204
def _page_changing(self, evt: wx.BookCtrlEvent):
205-
if (
206-
evt.GetOldSelection() != wx.NOT_FOUND
207-
and not self.GetPage(evt.GetOldSelection()).can_disable()
208-
):
209-
evt.Veto()
205+
old_selection_index = evt.GetOldSelection()
206+
if old_selection_index != wx.NOT_FOUND:
207+
old_page = self.GetPage(old_selection_index)
208+
if old_page is not None and not old_page.can_disable():
209+
evt.Veto()
210210

211211
def _page_changed(self, evt: wx.BookCtrlEvent):
212212
"""Handle the page changing."""
213213
if evt.GetOldSelection() != evt.GetSelection():
214214
if evt.GetOldSelection() != wx.NOT_FOUND:
215-
self.GetPage(evt.GetOldSelection()).disable()
215+
# self.GetPage(evt.GetOldSelection()).disable()
216+
old_page = self.GetPage(evt.GetOldSelection())
217+
if old_page is not None:
218+
old_page.disable()
216219

217220
if self.GetCurrentPage() is self._main_menu:
218221
self.SetAGWWindowStyleFlag(NOTEBOOK_MENU_STYLE)

0 commit comments

Comments
 (0)