summaryrefslogtreecommitdiff
path: root/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp
diff options
context:
space:
mode:
authorJosJuice <josjuice@gmail.com>2017-01-21 20:48:57 +0100
committerGitHub <noreply@github.com>2017-01-21 20:48:57 +0100
commit9fb01ecc730a9fdf9d053b270ac4bd17ed937446 (patch)
treee3bab60281e4da9df1ca407eaedd6aa0976f99f0 /Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp
parentce07e5c2f9d5eca51a5d31ae6d036af797ae84cf (diff)
parent3eb81ad219e33b3c8f16f42583ea245918ed0e6a (diff)
Merge pull request #4701 from leoetlino/netplay-map-bug
Netplay: Fix wrong mapping info being used in dialog
Diffstat (limited to 'Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp')
-rw-r--r--Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp b/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp
index dc0eec924f..cad10dce0f 100644
--- a/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp
+++ b/Source/Core/DolphinWX/NetPlay/PadMapDialog.cpp
@@ -40,7 +40,7 @@ PadMapDialog::PadMapDialog(wxWindow* parent, NetPlayServer* server, NetPlayClien
{
for (unsigned int j = 0; j < m_player_list.size(); j++)
{
- if (m_pad_mapping[idx] == m_player_list[j]->pid)
+ if (mapping[idx] == m_player_list[j]->pid)
{
m_map_cbox[base_idx + idx]->Select(j + 1);
break;