ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix NetPlay using some config values wrongly

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
Show Stats 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 // Settings
const std::string traversal_choice = Config::Get(Config::NETPLAY_TRAVERSAL_CHOICE);
const bool is_traversal = traversal_choice == "traversal";
std::string host_ip; std::string host_ip;
u16 host_port; u16 host_port;
if (Settings::Instance().GetNetPlayServer() != nullptr) if (Settings::Instance().GetNetPlayServer() != nullptr)
@ -1075,13 +1078,11 @@ bool MainWindow::NetPlayJoin()
} }
else else
{ {
host_ip = Config::Get(Config::NETPLAY_HOST_CODE); host_ip = is_traversal ? Config::Get(Config::NETPLAY_HOST_CODE) :
host_port = Config::Get(Config::NETPLAY_HOST_PORT); 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 std::string traversal_host = Config::Get(Config::NETPLAY_TRAVERSAL_SERVER);
const u16 traversal_port = Config::Get(Config::NETPLAY_TRAVERSAL_PORT); const u16 traversal_port = Config::Get(Config::NETPLAY_TRAVERSAL_PORT);
const std::string nickname = Config::Get(Config::NETPLAY_NICKNAME); const std::string nickname = Config::Get(Config::NETPLAY_NICKNAME);

7
Source/Core/DolphinQt2/NetPlay/NetPlaySetupDialog.cpp
View File

@ -183,7 +183,9 @@ void NetPlaySetupDialog::ConnectWidgets()
void NetPlaySetupDialog::SaveSettings() void NetPlaySetupDialog::SaveSettings()
{ {
Config::SetBaseOrCurrent(Config::NETPLAY_NICKNAME, m_nickname_edit->text().toStdString()); Config::SetBaseOrCurrent(Config::NETPLAY_NICKNAME, m_nickname_edit->text().toStdString());
Config::SetBaseOrCurrent(Config::NETPLAY_HOST_CODE, m_ip_edit->text().toStdString()); Config::SetBaseOrCurrent(m_connection_type->currentIndex() == 0 ? Config::NETPLAY_ADDRESS :
Config::NETPLAY_HOST_CODE,
m_ip_edit->text().toStdString());
Config::SetBaseOrCurrent(Config::NETPLAY_CONNECT_PORT, Config::SetBaseOrCurrent(Config::NETPLAY_CONNECT_PORT,
static_cast<u16>(m_connect_port_box->value())); static_cast<u16>(m_connect_port_box->value()));
Config::SetBaseOrCurrent(Config::NETPLAY_HOST_PORT, static_cast<u16>(m_host_port_box->value())); Config::SetBaseOrCurrent(Config::NETPLAY_HOST_PORT, static_cast<u16>(m_host_port_box->value()));
@ -211,7 +213,8 @@ void NetPlaySetupDialog::OnConnectionTypeChanged(int index)
m_reset_traversal_button->setHidden(index == 0); m_reset_traversal_button->setHidden(index == 0);
std::string address = Config::Get(Config::NETPLAY_HOST_CODE); std::string address =
index == 0 ? Config::Get(Config::NETPLAY_ADDRESS) : Config::Get(Config::NETPLAY_HOST_CODE);
m_ip_label->setText(index == 0 ? tr("IP Address:") : tr("Host Code:")); m_ip_label->setText(index == 0 ? tr("IP Address:") : tr("Host Code:"));
m_ip_edit->setText(QString::fromStdString(address)); m_ip_edit->setText(QString::fromStdString(address));