--- trunk/H7 Server/H7 ServerDlg.cpp	2007/01/29 13:01:41	7
+++ trunk/H7 Server/H7 ServerDlg.cpp	2007/01/29 14:35:42	8
@@ -99,6 +99,7 @@
 	//}}AFX_MSG_MAP
 	ON_BN_CLICKED(IDC_Start, OnBnClickedStart)
 	ON_BN_CLICKED(IDC_TEST, OnBnClickedTest)
+	ON_BN_CLICKED(IDC_RESTART, OnBnClickedRestart)
 END_MESSAGE_MAP()
 
 
@@ -133,18 +134,46 @@
 
 /**********************************************************************/
 	// TODO: Add extra initialization here
+	
 	// Sets values in baud-rate combo box	
 	m_BaudRate.AddString("1200");					
 	m_BaudRate.AddString("2400");					
-	m_BaudRate.AddString("4800");					
+	m_BaudRate.AddString("4800");	// Don't work, used for error test.			
 	m_BaudRate.AddString("9600");					
 	m_BaudRate.AddString("19200");
 
+	// Checks how many COM ports there are.
 	std::vector<CString> Serial = GetAvailableComPorts();
-	for (int i=0;i<Serial.size();i++)
+	for (unsigned int i=0; i<Serial.size(); i++)
 		m_Serial.AddString(Serial[i]);
 	m_Serial.SetCurSel(0);
 
+	// Load saved settings from regedit.
+	unsigned long Port;
+	unsigned long BaudRate;
+//	CString LoadCom;
+
+// Used to format the loaded values.
+	CString TPort;
+	CString TBaudRate;
+
+	CRegKey reg;
+	reg.Create(HKEY_LOCAL_MACHINE, "SOFTWARE\\Projekt\\Server");
+	reg.QueryDWORDValue("Port", Port);
+	reg.QueryDWORDValue("BaudRate", BaudRate);
+
+	char LoadCom[20];
+	unsigned long size = 20;
+	reg.QueryStringValue("Serial", LoadCom, &size);
+
+	TPort.Format("%d", Port);
+	TBaudRate.Format("%d", BaudRate);
+//	TLoadCom.Format("%s", TLoadCom);
+
+	m_Port.SetWindowText(TPort);
+	m_BaudRate.SetWindowText(TBaudRate);
+	m_Serial.SetWindowText(LoadCom);
+	MessageBox(LoadCom);
 /**********************************************************************/
 	return TRUE;  // return TRUE  unless you set the focus to a control
 }
@@ -216,6 +245,8 @@
 	CRegKey reg;
 	reg.Create(HKEY_LOCAL_MACHINE, "SOFTWARE\\Projekt\\Server");
 	reg.QueryDWORDValue("Port", Port);
+	TcpServer.Close();
+
 	TcpServer.Create(Port);
 	TcpServer.Listen();
 	return 0;
@@ -238,3 +269,14 @@
 	StartTcp();
 }
 
+
+void CH7ServerDlg::OnBnClickedRestart()
+{
+	CWaitCursor wait;		// Musen viser timeglas.
+	CString Port;
+	m_Port.GetWindowText(Port);
+	CRegKey reg;
+	reg.Create(HKEY_LOCAL_MACHINE, "SOFTWARE\\Projekt\\Server");
+	reg.SetDWORDValue("Port", atoi(Port) );
+	StartTcp();
+}