From e2c18bfbfdf55abd2041ed0227246ecbd48fa586 Mon Sep 17 00:00:00 2001
From: lotodore <pokerth@lotharmay.de>
Date: Mon, 10 Dec 2007 20:56:00 +0000
Subject: [PATCH] Fixes related to kicking players.

---
 src/gui/qt/gamelobbydialog/lobbychat/lobbychat.cpp | 9 +++------
 src/gui/qt/mainwindow/mainwindowimpl.cpp           | 3 ++-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/gui/qt/gamelobbydialog/lobbychat/lobbychat.cpp b/src/gui/qt/gamelobbydialog/lobbychat/lobbychat.cpp
index ec70874e..ff295385 100644
--- a/src/gui/qt/gamelobbydialog/lobbychat/lobbychat.cpp
+++ b/src/gui/qt/gamelobbydialog/lobbychat/lobbychat.cpp
@@ -100,13 +100,10 @@ void LobbyChat::playerKicked(QString nickName, QString byWhom, QString reason)
 {
 	if (myNick == nickName)
 	{
-		myLobby->accept();
-		QMessageBox::warning(myLobby, tr("Network Notification"),
-			tr("You were kicked from the server."),
-				QMessageBox::Close);
+		myLobby->treeWidget_NickList->clear();
+		myLobby->lineEdit_ChatInput->setEnabled(false);
 	}
-	else
-		myLobby->textBrowser_ChatDisplay->append(nickName + " " + tr("was kicked from the server by") + " " + byWhom + " (" + reason + ")");
+	myLobby->textBrowser_ChatDisplay->append(nickName + " " + tr("was kicked from the server by") + " " + byWhom + " (" + reason + ")");
 }
 
 void LobbyChat::playerLeft(QString playerName)
diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp
index 9bafcb51..7569b50c 100755
--- a/src/gui/qt/mainwindow/mainwindowimpl.cpp
+++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp
@@ -3194,7 +3194,8 @@ void mainWindowImpl::networkError(int errorID, int /*osErrorID*/) {
 				QMessageBox::Close); }
 		break;
 		case ERR_NET_PLAYER_KICKED:
-			{ QMessageBox::warning(this, tr("Network Error"),
+			{ mySession->terminateNetworkClient();
+			  QMessageBox::warning(this, tr("Network Error"),
 				tr("You were kicked from the server."),
 				QMessageBox::Close); }
 		break;