diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp index 9814644f78..57389e04b9 100644 --- a/Source/Core/DolphinQt/MainWindow.cpp +++ b/Source/Core/DolphinQt/MainWindow.cpp @@ -256,6 +256,10 @@ MainWindow::MainWindow(std::unique_ptr 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;