mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-28 19:58:53 +00:00
Merge pull request #7258 from Techjar/netplay-fix-segfaults
Fix more segfaults on NetPlay quit
This commit is contained in:
commit
2a776bf2b6
7 changed files with 48 additions and 29 deletions
|
@ -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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue