src/config/configfile.cpp

@@ -295,6 +295,9 @@ void ConfigFile::updateConfig(CONFIGSTATE myConfigState) {
 
 	}
 
+	if(myConfigState == old) {
+	}
+	
 	delete myQtToolsInterface;
 	myQtToolsInterface = 0;
 

src/gui/qt/joinnetworkgamedialog/joinnetworkgamedialogimpl.cpp

@@ -27,9 +27,12 @@ using namespace std;
 joinNetworkGameDialogImpl::joinNetworkGameDialogImpl(QWidget *parent)
       : QDialog(parent)
 {
+	bool toIntTrue;
     	
 	setupUi(this);
 
+	spinBox_port->setValue(QString::fromUtf8(myConfig.readConfigString("ServerPort").c_str()).toInt(&toIntTrue, 10));
+
 	//Profile Name darf nicht mit einer Zahl beginnen --> XML konform
 	QRegExp rx("[A-Z|a-z]+[A-Z|a-z|\\d]*");
  	QValidator *validator = new QRegExpValidator(rx, this);

src/gui/qt/waitforservertostartgamedialog.ui

@@ -80,5 +80,22 @@
   </layout>
  </widget>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>pushButton_cancel</sender>
+   <signal>clicked()</signal>
+   <receiver>waitForServerToStartGameDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>162</x>
+     <y>231</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>64</x>
+     <y>233</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>