diff --git a/cockatrice/src/chatview.cpp b/cockatrice/src/chatview.cpp index 0bca6bf4..e4f1b77f 100644 --- a/cockatrice/src/chatview.cpp +++ b/cockatrice/src/chatview.cpp @@ -23,8 +23,11 @@ ChatView::ChatView(const TabSupervisor *_tabSupervisor, TabGame *_game, bool _sh userContextMenu = new UserContextMenu(tabSupervisor, this, game); connect(userContextMenu, SIGNAL(openMessageDialog(QString, bool)), this, SIGNAL(openMessageDialog(QString, bool))); - userName = QString::fromStdString(tabSupervisor->getUserInfo()->name()); - mention = "@" + userName.toLower(); + if(tabSupervisor->getUserInfo()) + { + userName = QString::fromStdString(tabSupervisor->getUserInfo()->name()); + mention = "@" + userName.toLower(); + } mentionFormat.setFontWeight(QFont::Bold); @@ -127,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 buddyList = tabSupervisor->getUserListsTab()->getBuddyList()->getUsers(); cursor.insertImage(UserLevelPixmapGenerator::generatePixmap(pixelSize, userLevel, buddyList.contains(sender)).toImage()); diff --git a/cockatrice/src/tab_game.cpp b/cockatrice/src/tab_game.cpp index 0e513d51..0eeefe6f 100644 --- a/cockatrice/src/tab_game.cpp +++ b/cockatrice/src/tab_game.cpp @@ -246,7 +246,8 @@ TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay) activeCard(0), gameClosed(false), replay(_replay), - currentReplayStep(0) + currentReplayStep(0), + sayEdit(0) { setAttribute(Qt::WA_DeleteOnClose); @@ -885,7 +886,8 @@ void TabGame::startGame(bool resuming) gameInfo.set_started(true); static_cast(gameView->scene())->rearrange(); gameView->show(); - sayEdit->setFocus(); + if(sayEdit) + sayEdit->setFocus(); } void TabGame::stopGame()