summaryrefslogtreecommitdiff
path: root/CSharp/Ivy
diff options
context:
space:
mode:
authorfcolin2007-02-01 09:51:58 +0000
committerfcolin2007-02-01 09:51:58 +0000
commitdf6b53424691502238946f3ffec3c477b8c730d1 (patch)
tree6d6ae34e3d2033f9d273f2b8d87ce5746d6e570c /CSharp/Ivy
parent3184cdca9aa435d664f7bfab4a4762753df737bc (diff)
downloadivy-csharp-df6b53424691502238946f3ffec3c477b8c730d1.zip
ivy-csharp-df6b53424691502238946f3ffec3c477b8c730d1.tar.gz
ivy-csharp-df6b53424691502238946f3ffec3c477b8c730d1.tar.bz2
ivy-csharp-df6b53424691502238946f3ffec3c477b8c730d1.tar.xz
Utilisateur : Fcolin Date : 10/02/06 Heure : 14:12 Archivé dans $/CSharp/Ivy/Ivy Commentaire: (vss 21)
Diffstat (limited to 'CSharp/Ivy')
-rw-r--r--CSharp/Ivy/Ivy/IvyWatcher.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/CSharp/Ivy/Ivy/IvyWatcher.cs b/CSharp/Ivy/Ivy/IvyWatcher.cs
index 0cacef6..b943b21 100644
--- a/CSharp/Ivy/Ivy/IvyWatcher.cs
+++ b/CSharp/Ivy/Ivy/IvyWatcher.cs
@@ -164,7 +164,9 @@ namespace IvyBus
stream.Close();
if (listenThread != null)
{
- listenThread.Join();
+ // Wait for Thread to end.
+ bool term = listenThread.Join(10000);
+ if (!term && (listenThread != null)) listenThread.Abort();
listenThread = null;
}
// it might not even have been created