--- trunk/FlisServer/FlisServerDlg.cpp	2007/12/04 13:26:00	144
+++ trunk/FlisServer/FlisServerDlg.cpp	2007/12/05 09:21:56	153
@@ -471,6 +471,7 @@
 				AppendText(tekst);
 			}
 		}
+		Sleep(10); //Small delay to avoid busy wait
 	}
 	Sleep(100); //Give the modem a chance to send the last data
 	while(Serial.getComstat().cbInQue > 0)
@@ -923,27 +924,45 @@
 	CString SQL, name, value;
 	SQL = "select name, value from config;";
 	CRecordset rs(&db);
-	rs.Open(AFX_DB_USE_DEFAULT_TYPE, SQL);
-	if (rs.GetRecordCount()>0) 
+	try
 	{
-		rs.MoveFirst();
+		rs.Open(AFX_DB_USE_DEFAULT_TYPE, SQL);
+		if (rs.GetRecordCount()>0) 
+		{
+			rs.MoveFirst();
 			
-		rs.GetFieldValue((short)0, name);
-		rs.GetFieldValue(1,value);
+			rs.GetFieldValue((short)0, name);
+			rs.GetFieldValue(1,value);
 		
-		Alive.name = name;
-		Alive.value = value;
-		Alive.tid = CTime::GetCurrentTime();
-		if(Alive.name == "phonenr")
-		{
-			Alive.Phonenr = value;
-		}
+			Alive.name = name;
+			Alive.value = value;
+			Alive.tid = CTime::GetCurrentTime();
+			if(Alive.name == "phonenr")
+			{
+				Alive.Phonenr = value;
+			}
 
-		buffer.push_back(Alive);
-		rs.MoveNext();
+			buffer.push_back(Alive);
+			rs.MoveNext();
 
+		}
+		rs.Close();
+		return buffer;
 	}
-	rs.Close();
-	return buffer;
+	catch (char * str)
+	{
+		AppendText("Keepalive failed, closing and opening the db connection again");
+		if(db.IsOpen())
+		{
+			db.Close();
+			AppendText("DB connection closed");
+		}
+		if(!db.IsOpen())
+		{
+			DBConnect();
+			AppendText("DB connection started again");
+		}
+	}
+
 	
 }
\ No newline at end of file