Show and update admin player of a game even when in lobby and not in the game.

src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp

@@ -199,8 +199,9 @@ void gameLobbyDialogImpl::gameSelected(QTreeWidgetItem* item, QTreeWidgetItem*)
 		PlayerIdList::const_iterator end = info.players.end();
 		while (i != end)
 		{
-			PlayerInfo info(mySession->getClientPlayerInfo(*i));
-			addConnectedPlayer(*i, QString::fromUtf8(info.playerName.c_str()), PLAYER_RIGHTS_NORMAL);
+			PlayerRights tmpRights = info.adminPlayerId == *i ? PLAYER_RIGHTS_ADMIN : PLAYER_RIGHTS_NORMAL;
+			PlayerInfo playerInfo(mySession->getClientPlayerInfo(*i));
+			addConnectedPlayer(*i, QString::fromUtf8(playerInfo.playerName.c_str()), tmpRights);
 			++i;
 		}
 	}
@@ -247,6 +248,11 @@ void gameLobbyDialogImpl::updateGameMode(unsigned gameId, int /*newMode*/)
 	}
 }
 
+void gameLobbyDialogImpl::updateGameAdmin(unsigned /*gameId*/, unsigned adminPlayerId)
+{
+	newGameAdmin(adminPlayerId, "");
+}
+
 void gameLobbyDialogImpl::removeGame(unsigned gameId)
 {
 	QTreeWidgetItemIterator it(treeWidget_GameList);
@@ -268,8 +274,11 @@ void gameLobbyDialogImpl::gameAddPlayer(unsigned gameId, unsigned playerId)
 		if (item && item->data(0, Qt::UserRole) == gameId)
 		{
 			assert(mySession);
-			PlayerInfo info(mySession->getClientPlayerInfo(playerId));
-			addConnectedPlayer(playerId, QString::fromUtf8(info.playerName.c_str()), PLAYER_RIGHTS_NORMAL);
+			GameInfo info(mySession->getClientGameInfo(gameId));
+			PlayerRights tmpRights = info.adminPlayerId == playerId ? PLAYER_RIGHTS_ADMIN : PLAYER_RIGHTS_NORMAL;
+			PlayerInfo playerInfo(mySession->getClientPlayerInfo(playerId));
+
+			addConnectedPlayer(playerId, QString::fromUtf8(playerInfo.playerName.c_str()), tmpRights);
 		}
 	}
 
@@ -437,7 +446,7 @@ void gameLobbyDialogImpl::newGameAdmin(unsigned playerId, QString)
 		++it;
 	}
 
-	if (myPlayerId == playerId)
+	if (inGame && myPlayerId == playerId)
 	{
 		isAdmin = true;
 		checkPlayerQuantity();

src/gui/qt/gamelobbydialog/gamelobbydialogimpl.h

@@ -57,6 +57,7 @@ public slots:
 
 	void addGame(unsigned gameId);
 	void updateGameMode(unsigned gameId, int newMode);
+	void updateGameAdmin(unsigned gameId, unsigned adminPlayerId);
 	void removeGame(unsigned gameId);
 	void gameAddPlayer(unsigned gameId, unsigned playerId);
 	void gameRemovePlayer(unsigned gameId, unsigned playerId);

src/gui/qt/guiwrapper.cpp

@@ -135,6 +135,7 @@ void GuiWrapper::SignalNetClientNewGameAdmin(unsigned playerId, const string &pl
 void GuiWrapper::SignalNetClientGameListNew(unsigned gameId) { myW->signalNetClientGameListNew(gameId); }
 void GuiWrapper::SignalNetClientGameListRemove(unsigned gameId) { myW->signalNetClientGameListRemove(gameId); }
 void GuiWrapper::SignalNetClientGameListUpdateMode(unsigned gameId, GameMode mode) { myW->signalNetClientGameListUpdateMode(gameId, mode); }
+void GuiWrapper::SignalNetClientGameListUpdateAdmin(unsigned gameId, unsigned adminPlayerId) {myW->signalNetClientGameListUpdateAdmin(gameId, adminPlayerId); }
 void GuiWrapper::SignalNetClientGameListPlayerJoined(unsigned gameId, unsigned playerId) { myW->signalNetClientGameListPlayerJoined(gameId, playerId); }
 void GuiWrapper::SignalNetClientGameListPlayerLeft(unsigned gameId, unsigned playerId) { myW->signalNetClientGameListPlayerLeft(gameId, playerId); }
 
@@ -142,7 +143,7 @@ void GuiWrapper::SignalNetClientGameStart(boost::shared_ptr<Game> game) { myW->s
 void GuiWrapper::SignalNetClientChatMsg(const string &playerName, const string &msg) { myChat->signalChatMessage(QString::fromUtf8(playerName.c_str()), QString::fromUtf8(msg.c_str())); }
 void GuiWrapper::SignalNetClientWaitDialog() { myW->signalShowClientDialog(); }
 
-void GuiWrapper::SignalNetServerSuccess(int actionID) { }
+void GuiWrapper::SignalNetServerSuccess(int /*actionID*/) { }
 void GuiWrapper::SignalNetServerError(int errorID, int osErrorID) { myW->signalNetServerError(errorID, osErrorID); }
 
 void GuiWrapper::SignalIrcConnect(const string &server) { myW->signalIrcConnect(QString::fromUtf8(server.c_str())); }

src/gui/qt/guiwrapper.h

@@ -115,6 +115,7 @@ public:
 	void SignalNetClientGameListNew(unsigned gameId);
 	void SignalNetClientGameListRemove(unsigned gameId);
 	void SignalNetClientGameListUpdateMode(unsigned gameId, GameMode mode);
+	void SignalNetClientGameListUpdateAdmin(unsigned gameId, unsigned adminPlayerId);
 	void SignalNetClientGameListPlayerJoined(unsigned gameId, unsigned playerId);
 	void SignalNetClientGameListPlayerLeft(unsigned gameId, unsigned playerId);
 

src/gui/qt/mainwindow/mainwindowimpl.cpp

@@ -671,6 +671,7 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
 	connect(this, SIGNAL(signalNetClientGameListNew(unsigned)), myGameLobbyDialog, SLOT(addGame(unsigned)));
 	connect(this, SIGNAL(signalNetClientGameListRemove(unsigned)), myGameLobbyDialog, SLOT(removeGame(unsigned)));
 	connect(this, SIGNAL(signalNetClientGameListUpdateMode(unsigned, int)), myGameLobbyDialog, SLOT(updateGameMode(unsigned, int)));
+	connect(this, SIGNAL(signalNetClientGameListUpdateAdmin(unsigned, unsigned)), myGameLobbyDialog, SLOT(updateGameAdmin(unsigned, unsigned)));
 	connect(this, SIGNAL(signalNetClientGameListPlayerJoined(unsigned, unsigned)), myGameLobbyDialog, SLOT(gameAddPlayer(unsigned, unsigned)));
 	connect(this, SIGNAL(signalNetClientGameListPlayerLeft(unsigned, unsigned)), myGameLobbyDialog, SLOT(gameRemovePlayer(unsigned, unsigned)));
 	connect(this, SIGNAL(signalNetClientRemovedFromGame(int)), myGameLobbyDialog, SLOT(removedFromGame(int)));

src/gui/qt/mainwindow/mainwindowimpl.h

@@ -136,6 +136,7 @@ signals:
 	void signalNetClientGameListNew(unsigned gameId);
 	void signalNetClientGameListRemove(unsigned gameId);
 	void signalNetClientGameListUpdateMode(unsigned gameId, int mode);
+	void signalNetClientGameListUpdateAdmin(unsigned gameId, unsigned adminPlayerId);
 	void signalNetClientGameListPlayerJoined(unsigned gameId, unsigned playerId);
 	void signalNetClientGameListPlayerLeft(unsigned gameId, unsigned playerId);
 	void signalNetClientGameStart(boost::shared_ptr<Game> game);