1.1 --- a/Client/MainForm.cs	Thu Aug 14 10:41:44 2014 +0200
     1.2 +++ b/Client/MainForm.cs	Thu Aug 14 18:37:23 2014 +0200
     1.3 @@ -37,24 +37,38 @@
     1.4              InstanceContext instanceContext = new InstanceContext(iCallback);
     1.5              iClient = new Client(instanceContext);
     1.6  
     1.7 -            iClient.Connect("TestClient");
     1.8 +            //Connect using unique name
     1.9 +            string name = DateTime.Now.ToString("MM/dd/yyyy hh:mm:ss.fff tt");
    1.10 +            iClient.Connect(name);
    1.11 +            Text = Text + ": " + name;
    1.12  
    1.13          }
    1.14  
    1.15          public void CloseConnection()
    1.16          {
    1.17 -            iClient.Close();
    1.18 +            if (IsClientReady())
    1.19 +            {
    1.20 +                //iClient.Disconnect();
    1.21 +                iClient.Close();
    1.22 +            }
    1.23 +
    1.24              iClient = null;
    1.25              iCallback = null;
    1.26          }
    1.27  
    1.28          private void MainForm_FormClosing(object sender, FormClosingEventArgs e)
    1.29          {
    1.30 -            if (iClient != null) //Could catch exception instead
    1.31 +            if (IsClientReady()) //Could catch exception instead
    1.32              {
    1.33                  iClient.Disconnect();
    1.34 -                CloseConnection();
    1.35              }
    1.36 +
    1.37 +            CloseConnection();
    1.38 +        }
    1.39 +
    1.40 +        public bool IsClientReady()
    1.41 +        {
    1.42 +            return (iClient != null && iClient.State == CommunicationState.Opened);
    1.43          }
    1.44      }
    1.45  }