diff options
| author | Mat M <mathew1800@gmail.com> | 2018-07-09 00:38:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-09 00:38:12 -0400 |
| commit | 9487892c18574730fbcfe033b690f831ec06d262 (patch) | |
| tree | cba3c67f4132525363283da1241ef7a80f44b2b9 /Source/Core/DolphinQt/MainWindow.cpp | |
| parent | 8c97fb7cd4b165bc871c727faa249251b2ce8b5f (diff) | |
| parent | 675260b0f7b164dca59d2888ee2c58a921ca02c1 (diff) | |
Merge pull request #7226 from lioncash/netplay
Core: Namespace NetPlay utilities under the NetPlay namespace
Diffstat (limited to 'Source/Core/DolphinQt/MainWindow.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/MainWindow.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp index bdc22b6473..2be44afaf1 100644 --- a/Source/Core/DolphinQt/MainWindow.cpp +++ b/Source/Core/DolphinQt/MainWindow.cpp @@ -1087,10 +1087,11 @@ bool MainWindow::NetPlayJoin() const std::string nickname = Config::Get(Config::NETPLAY_NICKNAME); // Create Client - Settings::Instance().ResetNetPlayClient(new NetPlayClient( + const bool is_hosting_netplay = Settings::Instance().GetNetPlayServer() != nullptr; + Settings::Instance().ResetNetPlayClient(new NetPlay::NetPlayClient( host_ip, host_port, m_netplay_dialog, nickname, - NetTraversalConfig{Settings::Instance().GetNetPlayServer() != nullptr ? false : is_traversal, - traversal_host, traversal_port})); + NetPlay::NetTraversalConfig{is_hosting_netplay ? false : is_traversal, traversal_host, + traversal_port})); if (!Settings::Instance().GetNetPlayClient()->IsConnected()) { @@ -1134,8 +1135,9 @@ bool MainWindow::NetPlayHost(const QString& game_id) host_port = Config::Get(Config::NETPLAY_LISTEN_PORT); // Create Server - Settings::Instance().ResetNetPlayServer(new NetPlayServer( - host_port, use_upnp, NetTraversalConfig{is_traversal, traversal_host, traversal_port})); + Settings::Instance().ResetNetPlayServer(new NetPlay::NetPlayServer( + host_port, use_upnp, + NetPlay::NetTraversalConfig{is_traversal, traversal_host, traversal_port})); if (!Settings::Instance().GetNetPlayServer()->is_connected) { |