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

Merge pull request #6820 from spycrab/qt_netplay_ipfix 

Qt/NetPlayDialog: Fix broken IP label
This commit is contained in:
Anthony 2018-05-11 12:35:25 -07:00 committed by GitHub
parent 76f6c7523f 0abce1419b
commit 2d6a0b8025
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -312,7 +312,10 @@ void NetPlayDialog::show(std::string nickname, bool use_traversal)
m_room_box->addItem(tr("Room ID"));
for (const auto& iface : Settings::Instance().GetNetPlayServer()->GetInterfaceSet())
m_room_box->addItem(iface == "!local!" ? tr("Local") : QString::fromStdString(iface));
{
const auto interface = QString::fromStdString(iface);
m_room_box->addItem(iface == "!local!" ? tr("Local") : interface, interface);
}
}
m_start_button->setHidden(!is_hosting);
@ -399,7 +402,7 @@ void NetPlayDialog::UpdateGUI()
{
m_hostcode_label->setText(
QString::fromStdString(Settings::Instance().GetNetPlayServer()->GetInterfaceHost(
m_room_box->currentText().toStdString())));
m_room_box->currentData().toString().toStdString())));
m_hostcode_action_button->setText(tr("Copy"));
m_hostcode_action_button->setEnabled(true);
}