aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1194 from ZeldaZach/fix_1192

Browse source 
Fix local mention crash
This commit is contained in:
Zach 2015-07-03 18:41:48 -04:00
commit 360498c83f
3 changed files with 52 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cockatrice/src/chatview.cpp
View file

@ -298,6 +298,14 @@ void ChatView::appendMessage(QString message, QString sender, UserLevelFlags use
}
else if (index == mentionFirstIndex)
{
if (tabSupervisor->getIsLocalGame())
{
cursor.insertText("@");
message = message.mid(1);
}
else
{
QMap<QString, UserListTWI *> userList = tabSupervisor->getUserListsTab()->getAllUsersList()->getUsers();
int firstSpace = message.indexOf(" ");
@ -348,9 +356,10 @@ void ChatView::appendMessage(QString message, QString sender, UserLevelFlags use
}
}
}
}
else
{
message = message.mid(1); // Not certain when this would ever be reached, but just incase
message = message.mid(1); // Not certain when this would ever be reached, but just incase lets skip the character
}
}

2
cockatrice/src/tab_supervisor.cpp
View file

@ -184,6 +184,7 @@ int TabSupervisor::myAddTab(Tab *tab)
void TabSupervisor::start(const ServerInfo_User &_userInfo)
{
isLocalGame = false;
userInfo = new ServerInfo_User(_userInfo);
tabServer = new TabServer(this, client);
@ -227,6 +228,7 @@ void TabSupervisor::startLocal(const QList<AbstractClient *> &_clients)
tabDeckStorage = 0;
tabReplays = 0;
tabAdmin = 0;
isLocalGame = true;
userInfo = new ServerInfo_User;
localClients = _clients;
for (int i = 0; i < localClients.size(); ++i)

2
cockatrice/src/tab_supervisor.h
View file

@ -60,6 +60,7 @@ private:
void addCloseButtonToTab(Tab *tab, int tabIndex);
QString sanitizeTabName(QString dirty) const;
QString sanitizeHtml(QString dirty) const;
bool isLocalGame;
public:
TabSupervisor(AbstractClient *_client, QWidget *parent = 0);
~TabSupervisor();
@ -67,6 +68,7 @@ public:
void start(const ServerInfo_User &userInfo);
void startLocal(const QList<AbstractClient *> &_clients);
void stop();
bool getIsLocalGame() const { return isLocalGame; }
int getGameCount() const { return gameTabs.size(); }
TabUserLists *getUserListsTab() const { return tabUserLists; }
ServerInfo_User *getUserInfo() const { return userInfo; }