From 740bc001fb647255709b5385d5a8a19781722097 Mon Sep 17 00:00:00 2001 From: James Willcox Date: Wed, 26 Oct 2005 18:01:56 +0000 Subject: * correct the error handling in EntryGroup * get rid of evil Thread.Abort git-svn-id: file:///home/lennart/svn/public/avahi/trunk@878 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-sharp/Client.cs | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'avahi-sharp/Client.cs') diff --git a/avahi-sharp/Client.cs b/avahi-sharp/Client.cs index 73b6f57..cc77cf8 100644 --- a/avahi-sharp/Client.cs +++ b/avahi-sharp/Client.cs @@ -232,19 +232,15 @@ namespace Avahi public void Dispose () { - lock (this) { - if (handle != IntPtr.Zero) { - thread.Abort (); - - avahi_client_free (handle); - avahi_simple_poll_quit (spoll); - avahi_simple_poll_free (spoll); - handle = IntPtr.Zero; - } + if (handle != IntPtr.Zero) { + avahi_client_free (handle); + avahi_simple_poll_quit (spoll); + avahi_simple_poll_free (spoll); + handle = IntPtr.Zero; } } - internal void CheckError () + internal void ThrowError () { ErrorCode error = LastError; @@ -270,7 +266,6 @@ namespace Avahi lock (this) { avahi_simple_poll_loop (spoll); } - } catch (ThreadAbortException e) { } catch (Exception e) { Console.Error.WriteLine ("Error in avahi-sharp event loop: " + e); } -- cgit