X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-sharp%2FServiceBrowser.cs;h=5da7ea4b6f40fe87ec3c7b88f1c0eb22d4f255ae;hb=dab307a583fcacdb0703e451f4f854f540fc8ec1;hp=a96040cbc822770f377722bb3b580f7c567a9735;hpb=a9566d5dcac080d7fa91546823277c57a5d09a5f;p=catta

diff --git a/avahi-sharp/ServiceBrowser.cs b/avahi-sharp/ServiceBrowser.cs
index a96040c..5da7ea4 100644
--- a/avahi-sharp/ServiceBrowser.cs
+++ b/avahi-sharp/ServiceBrowser.cs
@@ -129,22 +129,30 @@ namespace Avahi
 
         private void Start ()
         {
-            if (handle != IntPtr.Zero || (addListeners.Count == 0 && removeListeners.Count == 0))
+            if (client.Handle == IntPtr.Zero || handle != IntPtr.Zero ||
+                (addListeners.Count == 0 && removeListeners.Count == 0))
                 return;
 
             IntPtr domainPtr = Utility.StringToPtr (domain);
             IntPtr typePtr = Utility.StringToPtr (type);
-            handle = avahi_service_browser_new (client.Handle, iface, (int) proto, typePtr, domainPtr,
-                                                cb, IntPtr.Zero);
+
+            lock (client) {
+                handle = avahi_service_browser_new (client.Handle, iface, (int) proto, typePtr, domainPtr,
+                                                    cb, IntPtr.Zero);
+            }
             Utility.Free (domainPtr);
             Utility.Free (typePtr);
         }
 
         private void Stop (bool force)
         {
-            if (handle != IntPtr.Zero && (force || (addListeners.Count == 0 && removeListeners.Count == 0))) {
-                avahi_service_browser_free (handle);
-                handle = IntPtr.Zero;
+            if (client.Handle != IntPtr.Zero && handle != IntPtr.Zero &&
+                (force || (addListeners.Count == 0 && removeListeners.Count == 0))) {
+                
+                lock (client) {
+                    avahi_service_browser_free (handle);
+                    handle = IntPtr.Zero;
+                }
             }
         }