diff options
author | fcolin | 2007-02-01 09:58:13 +0000 |
---|---|---|
committer | fcolin | 2007-02-01 09:58:13 +0000 |
commit | 10bd4bca86d12ee30cff3150b5f6c87d1e694277 (patch) | |
tree | 5fa8435aa984c4852c679350c82326049effc5e7 | |
parent | 55cbce6c34de38829a824a53594e4d613fc1d2dc (diff) | |
download | ivy-csharp-10bd4bca86d12ee30cff3150b5f6c87d1e694277.zip ivy-csharp-10bd4bca86d12ee30cff3150b5f6c87d1e694277.tar.gz ivy-csharp-10bd4bca86d12ee30cff3150b5f6c87d1e694277.tar.bz2 ivy-csharp-10bd4bca86d12ee30cff3150b5f6c87d1e694277.tar.xz |
Utilisateur : Fcolin Date : 22/12/05 Heure : 15:05 Archivé dans $/CSharp/Ivy Commentaire: (vss 26)
-rw-r--r-- | CSharp/Ivy/IvyPPC/IvyClient.cs | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/CSharp/Ivy/IvyPPC/IvyClient.cs b/CSharp/Ivy/IvyPPC/IvyClient.cs index 82e29bb..84f93e8 100644 --- a/CSharp/Ivy/IvyPPC/IvyClient.cs +++ b/CSharp/Ivy/IvyPPC/IvyClient.cs @@ -257,7 +257,7 @@ namespace IvyBus running = false;
if ( stream != null )
stream.Close();
- if ( Thread.CurrentThread != clientThread )
+ if (Thread.CurrentThread != clientThread && clientThread != null)
{
// Wait for Thread to end.
clientThread.Join();
@@ -446,9 +446,16 @@ namespace IvyBus {
lock( bindings )
{
- IvyBindingBase bind = (IvyBindingBase) bindings[id];
- bus.FireClientRemoveBinding( this, bind.expression );
- bindings.Remove(id);
+ try
+ {
+ IvyBindingBase bind = (IvyBindingBase)bindings[id];
+ bus.FireClientRemoveBinding(this, bind.expression);
+ bindings.Remove(id);
+ }
+ catch (KeyNotFoundException ex)
+ {
+ Console.WriteLine("DelBinding " + ex.Message);
+ }
}
}
public void TokenMsg(ushort id, string[] arg)
|