From ab6583b4304275968e9b807738b5bcf55647e675 Mon Sep 17 00:00:00 2001 From: Techjar Date: Fri, 5 Apr 2019 03:12:25 -0400 Subject: [PATCH] Qt/MainWindow: Fix segfault on exit while NetPlay is open --- Source/Core/DolphinQt/MainWindow.cpp | 4 ++++ 1 file changed, 4 insertions(+) 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;