From c55089e7284ae505172f2ffa596970c8b977cc35 Mon Sep 17 00:00:00 2001
From: lotodore <pokerth@lotharmay.de>
Date: Thu, 18 Oct 2007 20:58:56 +0000
Subject: [PATCH] Closing of the "starting game" dialog on error.

---
 src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
index 4b6f6796..072620ee 100644
--- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
@@ -62,10 +62,10 @@ void gameLobbyDialogImpl::exec()
 		groupBox_lobbyChat->hide(); 
 	}
 
+	QDialog::exec();
+
 	waitStartGameMsgBoxTimer->stop();
 	waitStartGameMsgBox->hide();
-
-	QDialog::exec();
 }
 
 
@@ -173,8 +173,6 @@ void gameLobbyDialogImpl::refresh(int actionID) {
 
 	if (actionID == MSG_NET_GAME_CLIENT_START)
 	{
-		waitStartGameMsgBoxTimer->stop();
-		waitStartGameMsgBox->hide();
 		QTimer::singleShot(500, this, SLOT(accept()));
 	}
 }
@@ -568,8 +566,8 @@ void gameLobbyDialogImpl::playerSelected(QTreeWidgetItem* item, QTreeWidgetItem*
 void gameLobbyDialogImpl::startGame() {
 
 	assert(mySession);
-	waitStartGameMsgBoxTimer->start(500);
 	mySession->sendStartEvent(checkBox_fillUpWithComputerOpponents->isChecked());
+	waitStartGameMsgBoxTimer->start(500);
 }
 
 void gameLobbyDialogImpl::leaveGame() {
@@ -667,8 +665,6 @@ void gameLobbyDialogImpl::hideShowGameDescription(bool show) {
 void gameLobbyDialogImpl::showWaitStartGameMsgBox() { 
 	waitStartGameMsgBox->show();
 	waitStartGameMsgBox->raise();
-     	waitStartGameMsgBox->activateWindow();
- }
-
-
+	waitStartGameMsgBox->activateWindow();
+}