--- trunk/FlisServer/FlisServerDlg.cpp	2007/12/05 09:21:56	153
+++ trunk/FlisServer/FlisServerDlg.cpp	2007/12/06 07:14:17	168
@@ -6,6 +6,7 @@
 #include "FlisServerDlg.h"
 #include <vector>
 #include ".\flisserverdlg.h"
+#include <atlrx.h>
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -373,7 +374,23 @@
 		HandleAcknowledge(TlfNr);
 		return;
 	}
-	
+	CAtlRegExp<> regex;
+	if (regex.Parse("^{[0-9]+}:{[0-9]+}:[0-1]:[0-1]:[0-1]:[0-1]:$") == REPARSE_ERROR_OK)
+	{
+
+		CAtlREMatchContext<> pContext;
+
+		if (!regex.Match(FyrData, &pContext))
+		{
+			AppendText("Invalid SMS recieved");
+			return;
+		}
+	}
+	else
+	{
+		AppendText("Regex PARSE error!!!"); //Burde aldrig kunne ske !
+	}
+
 	SmsCount = Splitter(FyrData);
 	Temper = Splitter(FyrData);
 	Flamme = Splitter(FyrData);
@@ -421,6 +438,7 @@
 {
 	// TODO: Add your control notification handler code here
 	continueThread = 0;
+	Sleep(250);
 	DeleteSms();
 
 	Sleep(500);
@@ -515,10 +533,10 @@
 {
 	while (continueThread != 0) 
 	{
-		Reader();
+		MyMainThread();
 	}
 }
-void CFlisServerDlg::Reader()
+void CFlisServerDlg::MyMainThread()
 {
 	if(Serial.getComstat().cbInQue > 0)
 		{
@@ -526,7 +544,6 @@
 			std::vector<unsigned char> answer = readFrame();
 			Sleep(500);
 			CString tekst, oldtekst;
-			int lol;
 		
 			for (int i=0; i<answer.size(); i++)
 			{
@@ -741,6 +758,7 @@
 		CString SQL, Textwindow;
 		SQL.Format("update command set executed=now() where id=%s",IDnr);
 		db.ExecuteSQL(SQL);
+		Sleep(100);
 		AppendText("Command executed");
 	}
 	Sleep(150);
@@ -818,6 +836,11 @@
 	Tekst.Append("\r\n");
 	Tekst.Append(s);
 	m_Textwindow.SetWindowText(Tekst);
+	int g = m_Textwindow.GetScrollLimit(SB_VERT);
+	if (g > 0)
+	{
+	m_Textwindow.SetScrollPos(g,1,false);
+	}
 
 }
 void ConfigFile::ReadSettings()
@@ -962,6 +985,7 @@
 			DBConnect();
 			AppendText("DB connection started again");
 		}
+		return buffer;
 	}