jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-12 13:00:01 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 8d911a7e28 into a8fcd9ec26

Browse source
This commit is contained in:
MassCraziness 2015-01-30 01:27:21 +00:00
commit 6d1ab1a225
1 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
cockatrice/src/tab_supervisor.cpp
View file

@ -446,11 +446,24 @@ void TabSupervisor::processGameEventContainer(const GameEventContainer &cont)
void TabSupervisor::processUserMessageEvent(const Event_UserMessage &event)
{
TabMessage *tab = messageTabs.value(QString::fromStdString(event.sender_name()));
QString senderName = QString::fromStdString(event.sender_name());
UserListTWI *twi = tabUserLists->getAllUsersList()->getUsers().value(senderName);
ServerInfo_User sendingUser;
if (twi)
sendingUser = twi->getUserInfo();
if (settingsCache->getIgnoreUnregisteredUsers())
return;
else
sendingUser.set_name(senderName.toStdString());
TabMessage *tab = messageTabs.value(senderName);
if (!tab)
tab = messageTabs.value(QString::fromStdString(event.receiver_name()));
if (!tab)
tab = addMessageTab(QString::fromStdString(event.sender_name()), false);
tab = addMessageTab(senderName, false);
if (!tab)
return;
tab->processUserMessageEvent(event);