Merge pull request #4837 from lioncash/npd

NetWindow: Make chat messages queue private

2 files changed, 4 insertions, 5 deletions

diff --git a/Source/Core/DolphinWX/NetPlay/NetWindow.cpp b/Source/Core/DolphinWX/NetPlay/NetWindow.cpp
index f082656a94..75cf03885e 100644
--- a/Source/Core/DolphinWX/NetPlay/NetWindow.cpp
+++ b/Source/Core/DolphinWX/NetPlay/NetWindow.cpp
@@ -386,7 +386,7 @@ void NetPlayDialog::Update()
 
 void NetPlayDialog::AppendChat(const std::string& msg)
 {
-  chat_msgs.Push(msg);
+  m_chat_msgs.Push(msg);
   // silly
   Update();
 }
@@ -613,10 +613,10 @@ void NetPlayDialog::OnThread(wxThreadEvent& event)
   }
 
   // chat messages
-  while (chat_msgs.Size())
+  while (m_chat_msgs.Size())
   {
     std::string s;
-    chat_msgs.Pop(s);
+    m_chat_msgs.Pop(s);
     AddChatMessage(ChatMessageType::UserIn, s);
 
     if (g_ActiveConfig.bShowNetPlayMessages)
diff --git a/Source/Core/DolphinWX/NetPlay/NetWindow.h b/Source/Core/DolphinWX/NetPlay/NetWindow.h
index 1dd36c52e4..bc199c2581 100644
--- a/Source/Core/DolphinWX/NetPlay/NetWindow.h
+++ b/Source/Core/DolphinWX/NetPlay/NetWindow.h
@@ -70,8 +70,6 @@ public:
                 const bool is_hosting = false);
   ~NetPlayDialog();
 
-  Common::FifoQueue<std::string> chat_msgs;
-
   void OnStart(wxCommandEvent& event);
 
   // implementation of NetPlayUI methods
@@ -150,6 +148,7 @@ private:
   std::string m_desync_player;
 
   std::vector<int> m_playerids;
+  Common::FifoQueue<std::string> m_chat_msgs;
 
   const CGameListCtrl* const m_game_list;