mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-05-11 21:52:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix NetPlay using some config values wrongly

Browse source
This commit is contained in:
Techjar 2018-07-05 17:52:53 -04:00
parent 14317c8a0f
commit eeff5e07ff
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Source/Core/DolphinQt2/MainWindow.cpp
View file

@ -1066,6 +1066,9 @@ bool MainWindow::NetPlayJoin()
}
// Settings
const std::string traversal_choice = Config::Get(Config::NETPLAY_TRAVERSAL_CHOICE);
const bool is_traversal = traversal_choice == "traversal";
std::string host_ip;
u16 host_port;
if (Settings::Instance().GetNetPlayServer() != nullptr)
@ -1075,13 +1078,11 @@ bool MainWindow::NetPlayJoin()
}
else
{
host_ip = Config::Get(Config::NETPLAY_HOST_CODE);
host_port = Config::Get(Config::NETPLAY_HOST_PORT);
host_ip = is_traversal ? Config::Get(Config::NETPLAY_HOST_CODE) :
Config::Get(Config::NETPLAY_ADDRESS);
host_port = Config::Get(Config::NETPLAY_CONNECT_PORT);
}
const std::string traversal_choice = Config::Get(Config::NETPLAY_TRAVERSAL_CHOICE);
const bool is_traversal = traversal_choice == "traversal";
const std::string traversal_host = Config::Get(Config::NETPLAY_TRAVERSAL_SERVER);
const u16 traversal_port = Config::Get(Config::NETPLAY_TRAVERSAL_PORT);
const std::string nickname = Config::Get(Config::NETPLAY_NICKNAME);