Merge pull request #6820 from spycrab/qt_netplay_ipfix

Qt/NetPlayDialog: Fix broken IP label
dolphin-emu · May 11, 2018 · 2d6a0b8 · 2d6a0b8
2 parents 76f6c75 + 0abce14
commit 2d6a0b8
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp b/Source/Core/DolphinQt2/NetPlay/NetPlayDialog.cpp
@@ -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);
   }