Merge pull request #7960 from Techjar/netplay-fix-segfault-on-exit

Qt/MainWindow: Fix segfault on exit while NetPlay is open
This commit is contained in:
JMC47 2019-04-05 11:48:07 -04:00 committed by GitHub
commit a7ee00ae25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions

View File

@ -256,6 +256,10 @@ MainWindow::MainWindow(std::unique_ptr<BootParameters> boot_parameters,
MainWindow::~MainWindow()
{
// Shut down NetPlay first to avoid race condition segfault
Settings::Instance().ResetNetPlayClient();
Settings::Instance().ResetNetPlayServer();
delete m_render_widget;
delete m_netplay_dialog;