1.1 --- a/Client/MainForm.cs	Thu Aug 14 09:30:14 2014 +0200
     1.2 +++ b/Client/MainForm.cs	Thu Aug 14 09:57:44 2014 +0200
     1.3 @@ -15,8 +15,8 @@
     1.4  {
     1.5      public partial class MainForm : Form
     1.6      {
     1.7 -        ClientOutput iClientOutput;
     1.8 -        ClientInput iClientInput;
     1.9 +        Client iClient;
    1.10 +        Callback iCallback;
    1.11  
    1.12          public MainForm()
    1.13          {
    1.14 @@ -27,25 +27,34 @@
    1.15          {
    1.16              //iClient.SetText(0,"Top");
    1.17              //iClient.SetText(1, "Bottom");
    1.18 -            iClientOutput.SetTexts(new string[] { "Top", "Bottom" });
    1.19 +            iClient.SetTexts(new string[] { "Top", "Bottom" });
    1.20          }
    1.21  
    1.22          private void MainForm_Load(object sender, EventArgs e)
    1.23          {
    1.24 -            iClientInput = new ClientInput();
    1.25 +            iCallback = new Callback();
    1.26              //Instance context is then managed by our client class
    1.27 -            InstanceContext instanceContext = new InstanceContext(iClientInput);
    1.28 -            iClientOutput = new ClientOutput(instanceContext);
    1.29 +            InstanceContext instanceContext = new InstanceContext(iCallback);
    1.30 +            iClient = new Client(instanceContext);
    1.31  
    1.32 -            iClientOutput.Connect("TestClient");
    1.33 +            iClient.Connect("TestClient");
    1.34  
    1.35          }
    1.36  
    1.37          public void CloseConnection()
    1.38          {
    1.39 -            iClientOutput.Close();
    1.40 -            iClientOutput = null;
    1.41 -            iClientInput = null;
    1.42 +            iClient.Close();
    1.43 +            iClient = null;
    1.44 +            iCallback = null;
    1.45 +        }
    1.46 +
    1.47 +        private void MainForm_FormClosing(object sender, FormClosingEventArgs e)
    1.48 +        {
    1.49 +            if (iClient != null) //Could catch exception instead
    1.50 +            {
    1.51 +                iClient.Disconnect();
    1.52 +                CloseConnection();
    1.53 +            }
    1.54          }
    1.55      }
    1.56  }