From 6b7da3223a81816b4eccb184aa85b37a1e31e506 Mon Sep 17 00:00:00 2001
From: Daenyth <Daenyth+git@gmail.com>
Date: Wed, 7 Dec 2011 23:37:04 -0500
Subject: [PATCH] Fix NPE in GameSelector::GameSelector when called from
 UserList::gamesOfUserReceived

---
 cockatrice/src/gameselector.cpp | 2 +-
 cockatrice/src/tab_room.h       | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/cockatrice/src/gameselector.cpp b/cockatrice/src/gameselector.cpp
index 743d5263..927d2e62 100644
--- a/cockatrice/src/gameselector.cpp
+++ b/cockatrice/src/gameselector.cpp
@@ -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);
diff --git a/cockatrice/src/tab_room.h b/cockatrice/src/tab_room.h
index a3b767ec..676bd8e0 100644
--- a/cockatrice/src/tab_room.h
+++ b/cockatrice/src/tab_room.h
@@ -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