From 6e7f6dfdbec3b925b5c67142564e17b6f6061232 Mon Sep 17 00:00:00 2001
From: lotodore <pokerth@lotharmay.de>
Date: Mon, 19 Feb 2007 00:39:44 +0000
Subject: [PATCH] Cleanup of the joinnetworkgamedialog. Thread
 creation/termination is now done in main window. Added code to locate memory
 leaks.

---
 .../connecttoserverdialogimpl.cpp             |  4 ++--
 .../joinnetworkgamedialogimpl.cpp             |  7 ------
 .../joinnetworkgamedialogimpl.h               |  6 -----
 src/gui/qt/mainwindow/mainwindowimpl.cpp      | 16 ++++++++++----
 src/pokerth.cpp                               | 22 +++++++++++++++++++
 5 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.cpp b/src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.cpp
index b209b959..a8323b09 100644
--- a/src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.cpp
+++ b/src/gui/qt/connecttoserverdialog/connecttoserverdialogimpl.cpp
@@ -63,7 +63,7 @@ void connectToServerDialogImpl::error(int errorID, int osErrorID) {
 		break;
 		case ERR_SOCK_CREATION_FAILED:
 			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("Could not create socket."),
+				tr("Could not create a socket for TCP communication."),
 				QMessageBox::Close); }
 		break;
 		case ERR_SOCK_SET_PORT_FAILED:
@@ -78,7 +78,7 @@ void connectToServerDialogImpl::error(int errorID, int osErrorID) {
 		break;
 		case ERR_SOCK_CONNECT_FAILED:
 			{ QMessageBox::warning(this, tr("Network Error"),
-				tr("Could not connect to server."),
+				tr("Could not connect to the server."),
 				QMessageBox::Close); }
 		break;
 		default:  { QMessageBox::warning(this, tr("Network Error"),
diff --git a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp
index 81bd2252..8af417b5 100644
--- a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp
+++ b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp
@@ -31,14 +31,7 @@ joinNetworkGameDialogImpl::joinNetworkGameDialogImpl(QWidget *parent)
 	
 }
 
-void joinNetworkGameDialogImpl::setSession(Session* s)
-{
-	mySession = s;
-}
-
 void joinNetworkGameDialogImpl::startClient() {
 
 	// TODO: Check input values!
-	if (mySession)
-		mySession->startNetworkClient(lineEdit_ipAddress->text().toUtf8().constData(), spinBox_port->value(), checkBox_ipv6->isChecked(), lineEdit_password->text().toUtf8().constData());
 }
diff --git a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h
index 9db8f8f0..d423bbd8 100644
--- a/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h
+++ b/src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.h
@@ -33,15 +33,9 @@ Q_OBJECT
 public:
     joinNetworkGameDialogImpl(QWidget *parent = 0);
 
-	void setSession(Session* s);
-
 public slots:
 
 	void startClient();
-
-private:
-
-	Session *mySession;
 };
 
 #endif
diff --git a/src/gui/qt/mainwindow/mainwindowimpl.cpp b/src/gui/qt/mainwindow/mainwindowimpl.cpp
index ce9653a4..77a6af2e 100755
--- a/src/gui/qt/mainwindow/mainwindowimpl.cpp
+++ b/src/gui/qt/mainwindow/mainwindowimpl.cpp
@@ -551,17 +551,25 @@ void mainWindowImpl::callAboutPokerthDialog() {
 
 void mainWindowImpl::callJoinNetworkGameDialog() {
 	
-	myJoinNetworkGameDialog->setSession(mySession);
 	myJoinNetworkGameDialog->exec();
 
-	if (	myJoinNetworkGameDialog->result() == QDialog::Accepted ) {
+	if (myJoinNetworkGameDialog->result() == QDialog::Accepted ) {
+
+		mySession->terminateNetworkClient();
+
+		// Maybe use QUrl::toPunycode.
+		mySession->startNetworkClient(
+			myJoinNetworkGameDialog->lineEdit_ipAddress->text().toUtf8().constData(),
+			myJoinNetworkGameDialog->spinBox_port->value(),
+			myJoinNetworkGameDialog->checkBox_ipv6->isChecked(),
+			myJoinNetworkGameDialog->lineEdit_password->text().toUtf8().constData());
 
 		//Dialog mit Statusbalken
 		myConnectToServerDialog->exec();
 
 		if (myConnectToServerDialog->result() == QDialog::Rejected ) {
-			callJoinNetworkGameDialog();
-		
+			mySession->terminateNetworkClient();
+			actionJoin_network_Game->trigger(); // re-trigger
 		}
 
 	}
diff --git a/src/pokerth.cpp b/src/pokerth.cpp
index 975223b2..92b5e73c 100755
--- a/src/pokerth.cpp
+++ b/src/pokerth.cpp
@@ -31,12 +31,34 @@
 #include <cstdlib>
 #include <ctime>
 
+#ifdef _MSC_VER
+	#ifdef _DEBUG
+		#define _CRTDBG_MAP_ALLOC
+		#include <crtdbg.h>
+
+		#define ENABLE_LEAK_CHECK() \
+			{ \
+				int tmpFlag = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG); \
+				tmpFlag |= _CRTDBG_LEAK_CHECK_DF; \
+				_CrtSetDbgFlag(tmpFlag); \
+			}
+	#endif
+#endif
+
+#ifndef ENABLE_LEAK_CHECK
+	#define ENABLE_LEAK_CHECK()
+#endif
+
 using namespace std;
 
 class GuiWrapper;
 
 int main( int argc, char **argv )
 {
+	ENABLE_LEAK_CHECK();
+
+	//_CrtSetBreakAlloc(49937);
+
 	socket_startup();
 
 	srand( time(0) );