piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 23:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix more segfaults on NetPlay quit

Browse Source 
Basically everything here was race conditions in Qt callbacks, so I changed the client/server instances to std::shared_ptr and added null checks. It checks that the object exists in the callback, and the shared_ptr ensures it doesn't get destroyed until we're done with it.

MD5 check would also cause a segfault if you quit without cancelling it first, which was pretty silly.
This commit is contained in:
Techjar
2018-07-12 20:37:12 -04:00
parent a21d536f99
commit cfeffdcf42
7 changed files with 48 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/DolphinQt/Settings.cpp
View File

@ -276,9 +276,9 @@ GameListModel* Settings::GetGameListModel() const
return model;
}
NetPlay::NetPlayClient* Settings::GetNetPlayClient()
std::shared_ptr<NetPlay::NetPlayClient> Settings::GetNetPlayClient()
{
return m_client.get();
return m_client;
}
void Settings::ResetNetPlayClient(NetPlay::NetPlayClient* client)
@ -286,9 +286,9 @@ void Settings::ResetNetPlayClient(NetPlay::NetPlayClient* client)
m_client.reset(client);
}
NetPlay::NetPlayServer* Settings::GetNetPlayServer()
std::shared_ptr<NetPlay::NetPlayServer> Settings::GetNetPlayServer()
{
return m_server.get();
return m_server;
}
void Settings::ResetNetPlayServer(NetPlay::NetPlayServer* server)