Yaya48/dolphin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #14206 from cscd98/send-message

Browse Source 
mingw: replace usages of SendMessage due to clash with existing function
This commit is contained in:
JMC47
2025-12-22 13:41:03 -05:00
committed by GitHub
parent 6d9978519a 26b6980d1a
commit d458d6d92a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/VideoCommon/NetPlayChatUI.cpp
+3 -3
View File
@@ -59,7 +59,7 @@ void NetPlayChatUI::Display()
if (ImGui::InputText("##NetplayMessageBuffer", m_message_buf, IM_ARRAYSIZE(m_message_buf), if (ImGui::InputText("##NetplayMessageBuffer", m_message_buf, IM_ARRAYSIZE(m_message_buf),
ImGuiInputTextFlags_EnterReturnsTrue)) ImGuiInputTextFlags_EnterReturnsTrue))
{ {
SendMessage(); SendChatMessage();
} }
if (m_activate) if (m_activate)
@@ -73,7 +73,7 @@ void NetPlayChatUI::Display()
ImGui::SameLine(); ImGui::SameLine();
if (ImGui::Button("Send")) if (ImGui::Button("Send"))
SendMessage(); SendChatMessage();
ImGui::End(); ImGui::End();
} }
@@ -90,7 +90,7 @@ void NetPlayChatUI::AppendChat(std::string message, Color color)
m_scroll_to_bottom = true; m_scroll_to_bottom = true;
} }
void NetPlayChatUI::SendMessage() void NetPlayChatUI::SendChatMessage()
{ {
// Check whether the input field is empty // Check whether the input field is empty
if (m_message_buf[0] != '\0') if (m_message_buf[0] != '\0')
Source/Core/VideoCommon/NetPlayChatUI.h
+1 -1
View File
@@ -20,7 +20,7 @@ public:
void Display(); void Display();
void AppendChat(std::string message, Color color); void AppendChat(std::string message, Color color);
void SendMessage(); void SendChatMessage();
void Activate(); void Activate();
private: private: