Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
e2be1cd8
Commit
e2be1cd8
authored
Jul 03, 2015
by
Zach H
Browse files
fix local mention crash
parent
14e8fcdd
Changes
3
Show whitespace changes
Inline
Side-by-side
cockatrice/src/chatview.cpp
View file @
e2be1cd8
...
...
@@ -298,6 +298,14 @@ void ChatView::appendMessage(QString message, QString sender, UserLevelFlags use
}
else
if
(
index
==
mentionFirstIndex
)
{
if
(
tabSupervisor
->
isALocalGame
())
{
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
}
}
...
...
cockatrice/src/tab_supervisor.cpp
View file @
e2be1cd8
...
...
@@ -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
)
...
...
cockatrice/src/tab_supervisor.h
View file @
e2be1cd8
...
...
@@ -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
isALocalGame
()
const
{
return
isLocalGame
;
}
int
getGameCount
()
const
{
return
gameTabs
.
size
();
}
TabUserLists
*
getUserListsTab
()
const
{
return
tabUserLists
;
}
ServerInfo_User
*
getUserInfo
()
const
{
return
userInfo
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment