mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-29 20:28:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7258 from Techjar/netplay-fix-segfaults

Browse source 
Fix more segfaults on NetPlay quit
This commit is contained in:
spycrab 2018-07-30 11:52:38 +02:00 • committed by GitHub
commit 2a776bf2b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

@ -286,9 +286,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)
@ -296,9 +296,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)