Merge patch for #684

This commit is contained in:
Fabio Bas 2015-02-08 00:40:28 +01:00
parent 9c6784a1c0
commit ae674e54b0

View file

@ -130,7 +130,7 @@ void ChatView::appendMessage(QString message, QString sender, UserLevelFlags use
senderFormat.setAnchor(true);
senderFormat.setAnchorHref("user://" + QString::number(userLevel) + "_" + sender);
if (!sameSender) {
if (!sender.isEmpty()) {
if (!sender.isEmpty() && tabSupervisor->getUserListsTab()) {
const int pixelSize = QFontInfo(cursor.charFormat().font()).pixelSize();
QMap<QString, UserListTWI *> buddyList = tabSupervisor->getUserListsTab()->getBuddyList()->getUsers();
cursor.insertImage(UserLevelPixmapGenerator::generatePixmap(pixelSize, userLevel, buddyList.contains(sender)).toImage());