X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=inline;f=avahi-sharp%2FClient.cs;fp=avahi-sharp%2FClient.cs;h=cc77cf870e0100fa1c8da4b22c9065591f70425b;hb=740bc001fb647255709b5385d5a8a19781722097;hp=73b6f57c0b85f19db23ea3e84c51d027e928a161;hpb=404c44c11b3d63c6a53b81ed7b9231387305c33f;p=catta 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); }