Skip to content

Commit

Permalink
#5586: Fix crash at shutdown in wxMSW due to the wxAuiManager not unr…
Browse files Browse the repository at this point in the history
…egistering itself from the managed window
  • Loading branch information
codereader committed Apr 11, 2021
1 parent 9109dbd commit 960c259
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions radiant/ui/mainframe/AuiLayout.cpp
Expand Up @@ -158,6 +158,13 @@ void AuiLayout::deactivate()
GlobalGroupDialog().hideDialogWindow();

GlobalGroupDialog().removePage("textures"); // do this after destroyWindow()

// Unregister the AuiMgr from the event handlers of the managed window
// otherwise we run into crashes during shutdown (#5586)
_auiMgr.UnInit();

// Dispose of the managed window
delete _auiMgr.GetManagedWindow();
}

void AuiLayout::restoreStateFromRegistry()
Expand Down

0 comments on commit 960c259

Please sign in to comment.