merge fixes

Proftaak Remote Healthcare/FietsClientV2/Forms/DoctorForm.cs

@@ -66,7 +66,7 @@ namespace FietsClient
             else if (messageBox.Text != null && doctorTabControl.SelectedTab.Name == "tabPageSummary")
             {
                 String[] data = new String[2];
-                data[0] = "This is a broadcast: " + messageBox.Text;
+                data[0] = "This is a broadcast: " + messageBox.Text + "\r\n";
                 //all patients:
                 for (int tabs = 1; tabs <= doctorTabControl.TabCount -1; tabs++)
                 {

Proftaak Remote Healthcare/FietsClientV2/TCPConnection.cs

@@ -11,6 +11,7 @@ using System.Threading;
 using System.Windows.Forms;
 using System.Security.Cryptography.X509Certificates;
 using System.Security.Authentication;
+using System.IO;
 
 namespace FietsClient
 {
@@ -118,18 +119,28 @@ namespace FietsClient
 
         public void disconnect()
         {
-            receiveThread.Abort();
+           
             sslStream.Close();
             client.Close();
+            receiveThread.Abort();
             isConnectedFlag = false;
         }
 
         public void receive()
         {
-            while (true)
+            while (client.Connected)
             {
                 byte[] bytesFrom = new byte[(int)client.ReceiveBufferSize];
-                sslStream.Read(bytesFrom, 0, client.ReceiveBufferSize);
+                try
+                {
+                    sslStream.Read(bytesFrom, 0, client.ReceiveBufferSize);
+                }
+                catch (IOException e)
+                {
+                    Console.WriteLine(e.StackTrace);
+                    break;
+                }
+
                 string response = Encoding.ASCII.GetString(bytesFrom);
                 string[] response_parts = response.Split('|');
 

Proftaak Remote Healthcare/FietsSimulator/FietsSimulator.cs

@@ -72,11 +72,12 @@ namespace FietsSimulator
                 stopwatch.Stop();
                 SendData("ACK");
             }
-            else if (message == "CU")
+            else if (message == "CM" || message == "CU")
             {
                 curmode = Mode.CONSOLE;
                 SendData("ACK");
-            }else if (message.Contains("PD"))
+            }
+            else if (message.Contains("PD"))
             {
                 if (curmode == Mode.CONSOLE && message.Split().Length == 2)
                 {