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 #7956 from spycrab/fix_np_chat_escape 

Qt/NetPlayDialog: Fix messages being html-escaped for NetPlay Chat
This commit is contained in:
JosJuice 2019-04-03 18:50:33 +02:00 committed by GitHub
parent 923151e3e3 628d72c67d
commit bfde5b931e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp
View File

@ -361,9 +361,9 @@ void NetPlayDialog::SendMessage(const std::string& msg)
{
Settings::Instance().GetNetPlayClient()->SendChatMessage(msg);
DisplayMessage(QStringLiteral("%1: %2").arg(QString::fromStdString(m_nickname).toHtmlEscaped(),
QString::fromStdString(msg).toHtmlEscaped()),
"");
DisplayMessage(
QStringLiteral("%1: %2").arg(QString::fromStdString(m_nickname), QString::fromStdString(msg)),
"");
}
void NetPlayDialog::OnChat()
@ -768,8 +768,8 @@ void NetPlayDialog::Update()
void NetPlayDialog::DisplayMessage(const QString& msg, const std::string& color, int duration)
{
QueueOnObject(m_chat_edit, [this, color, msg] {
m_chat_edit->append(
QStringLiteral("<font color='%1'>%2</font>").arg(QString::fromStdString(color), msg));
m_chat_edit->append(QStringLiteral("<font color='%1'>%2</font>")
.arg(QString::fromStdString(color), msg.toHtmlEscaped()));
});
QColor c(color.empty() ? QStringLiteral("white") : QString::fromStdString(color));
@ -782,7 +782,7 @@ void NetPlayDialog::DisplayMessage(const QString& msg, const std::string& color,
void NetPlayDialog::AppendChat(const std::string& msg)
{
DisplayMessage(QString::fromStdString(msg).toHtmlEscaped(), "");
DisplayMessage(QString::fromStdString(msg), "");
QApplication::alert(this);
}