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 #4837 from lioncash/npd 

NetWindow: Make chat messages queue private
This commit is contained in:
Anthony 2017-02-06 10:20:29 -08:00 committed by GitHub
parent f978765bf0 2597d2b69b
commit 0c7d9bbb73
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/DolphinWX/NetPlay/NetWindow.cpp
View File

@ -386,7 +386,7 @@ void NetPlayDialog::Update()
void NetPlayDialog::AppendChat(const std::string& msg) void NetPlayDialog::AppendChat(const std::string& msg)
{ {
chat_msgs.Push(msg); m_chat_msgs.Push(msg);
// silly // silly
Update(); Update();
} }
@ -613,10 +613,10 @@ void NetPlayDialog::OnThread(wxThreadEvent& event)
} }
// chat messages // chat messages
while (chat_msgs.Size()) while (m_chat_msgs.Size())
{ {
std::string s; std::string s;
chat_msgs.Pop(s); m_chat_msgs.Pop(s);
AddChatMessage(ChatMessageType::UserIn, s); AddChatMessage(ChatMessageType::UserIn, s);
if (g_ActiveConfig.bShowNetPlayMessages) if (g_ActiveConfig.bShowNetPlayMessages)

3
Source/Core/DolphinWX/NetPlay/NetWindow.h
View File

@ -70,8 +70,6 @@ public:
const bool is_hosting = false); const bool is_hosting = false);
~NetPlayDialog(); ~NetPlayDialog();
Common::FifoQueue<std::string> chat_msgs;
void OnStart(wxCommandEvent& event); void OnStart(wxCommandEvent& event);
// implementation of NetPlayUI methods // implementation of NetPlayUI methods
@ -150,6 +148,7 @@ private:
std::string m_desync_player; std::string m_desync_player;
std::vector<int> m_playerids; std::vector<int> m_playerids;
Common::FifoQueue<std::string> m_chat_msgs;
const CGameListCtrl* const m_game_list; const CGameListCtrl* const m_game_list;