#5127: Fix a crash during shutdown due to _topLevelWindow pointing to…

… a freed resource
codereader · Jan 2, 2021 · 3a7b013 · 3a7b013
1 parent b75f700
commit 3a7b013
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/radiant/ui/mainframe/MainFrame.cpp b/radiant/ui/mainframe/MainFrame.cpp
@@ -354,6 +354,7 @@ void MainFrame::onTopLevelFrameClose(wxCloseEvent& ev)
 
     // Destroy the actual window
     _topLevelWindow->Destroy();
+    _topLevelWindow = nullptr;
 
     // wxWidgets is supposed to quit when the main window is destroyed, but
     // it doesn't so we need to exit the main loop manually. Probably we
@@ -369,7 +370,7 @@ wxFrame* MainFrame::getWxTopLevelWindow()
 
 wxBoxSizer* MainFrame::getWxMainContainer()
 {
-	return _topLevelWindow != NULL ? _topLevelWindow->getMainContainer() : NULL;
+	return _topLevelWindow != nullptr ? _topLevelWindow->getMainContainer() : nullptr;
 }
 
 bool MainFrame::isActiveApp()