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
6b7da322
Commit
6b7da322
authored
Dec 07, 2011
by
Daenyth
Browse files
Fix NPE in GameSelector::GameSelector when called from UserList::gamesOfUserReceived
parent
86ae8a47
Changes
2
Hide whitespace changes
Inline
Side-by-side
cockatrice/src/gameselector.cpp
View file @
6b7da322
...
...
@@ -18,7 +18,7 @@ GameSelector::GameSelector(AbstractClient *_client, TabSupervisor *_tabSuperviso
{
gameListView
=
new
QTreeView
;
gameListModel
=
new
GamesModel
(
_rooms
,
_gameTypes
,
this
);
gameListProxyModel
=
new
GamesProxyModel
(
this
,
room
->
getCurrentUser
());
gameListProxyModel
=
new
GamesProxyModel
(
this
,
tabSupervisor
->
getUserInfo
());
gameListProxyModel
->
setSourceModel
(
gameListModel
);
gameListProxyModel
->
setSortCaseSensitivity
(
Qt
::
CaseInsensitive
);
gameListView
->
setModel
(
gameListProxyModel
);
...
...
cockatrice/src/tab_room.h
View file @
6b7da322
...
...
@@ -63,7 +63,6 @@ public:
const
QMap
<
int
,
QString
>
&
getGameTypes
()
const
{
return
gameTypes
;
}
QString
getChannelName
()
const
{
return
roomName
;
}
QString
getTabText
()
const
{
return
roomName
;
}
ServerInfo_User
*
getCurrentUser
()
{
return
ownUser
;
}
};
#endif
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