summaryrefslogtreecommitdiff
path: root/Source/Core/Common/TraversalClient.cpp
diff options
context:
space:
mode:
authorAdmiral H. Curtiss <pikachu025@gmail.com>2023-04-20 22:17:19 +0200
committerGitHub <noreply@github.com>2023-04-20 22:17:19 +0200
commitbe1f2a6852ab7171a6016e018479cba4883fe329 (patch)
treefe8db3be7cb6ffaa386249879339d3609f5091c1 /Source/Core/Common/TraversalClient.cpp
parentc3cc1de54e89f7d0dced58b247a95dd052b7c26e (diff)
parentb4cc1ade020665d0ba8f5c5e40c7f4f1ce90ec38 (diff)
Merge pull request #11773 from lioncash/delete
Common/TraversalClient: Use correct deleter with g_MainNetHost
Diffstat (limited to 'Source/Core/Common/TraversalClient.cpp')
-rw-r--r--Source/Core/Common/TraversalClient.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/Core/Common/TraversalClient.cpp b/Source/Core/Common/TraversalClient.cpp
index f3ab481a51..b215e5d269 100644
--- a/Source/Core/Common/TraversalClient.cpp
+++ b/Source/Core/Common/TraversalClient.cpp
@@ -304,7 +304,7 @@ int ENET_CALLBACK TraversalClient::InterceptCallback(ENetHost* host, ENetEvent*
}
std::unique_ptr<TraversalClient> g_TraversalClient;
-std::unique_ptr<ENetHost> g_MainNetHost;
+Common::ENet::ENetHostPtr g_MainNetHost;
// The settings at the previous TraversalClient reset - notably, we
// need to know not just what port it's on, but whether it was
@@ -323,18 +323,18 @@ bool EnsureTraversalClient(const std::string& server, u16 server_port, u16 liste
g_OldListenPort = listen_port;
ENetAddress addr = {ENET_HOST_ANY, listen_port};
- ENetHost* host = enet_host_create(&addr, // address
- 50, // peerCount
- NetPlay::CHANNEL_COUNT, // channelLimit
- 0, // incomingBandwidth
- 0); // outgoingBandwidth
+ auto host = Common::ENet::ENetHostPtr{enet_host_create(&addr, // address
+ 50, // peerCount
+ NetPlay::CHANNEL_COUNT, // channelLimit
+ 0, // incomingBandwidth
+ 0)}; // outgoingBandwidth
if (!host)
{
g_MainNetHost.reset();
return false;
}
host->mtu = std::min(host->mtu, NetPlay::MAX_ENET_MTU);
- g_MainNetHost.reset(host);
+ g_MainNetHost = std::move(host);
g_TraversalClient.reset(new TraversalClient(g_MainNetHost.get(), server, server_port));
}
return true;