From 8056390e00ca6576323d6c41a4dc725bcba9b527 Mon Sep 17 00:00:00 2001
From: Owen Fraser-Green <owen@discobabe.net>
Date: Sat, 3 Apr 2004 22:00:40 +0000
Subject: Made proxy DLL names unique

---
 mono/Connection.cs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'mono/Connection.cs')

diff --git a/mono/Connection.cs b/mono/Connection.cs
index 5e25ffd6..fad0dc56 100644
--- a/mono/Connection.cs
+++ b/mono/Connection.cs
@@ -64,15 +64,16 @@ namespace DBus
     internal static Connection Wrap(IntPtr rawConnection) 
     {
       if (slot > -1) {
-	// If we already have a Connection object associated with this rawConnection then return it
+	// Maybe we already have a Connection object associated with
+	// this rawConnection then return it
 	IntPtr rawThis = dbus_connection_get_data (rawConnection, slot);
-	return (DBus.Connection) ((GCHandle)rawThis).Target;
-      } 
-      else 
-	{
-	  // If it doesn't exist then create a new connection around it
-	  return new Connection(rawConnection);
+	if (rawThis != IntPtr.Zero) {
+	  return (DBus.Connection) ((GCHandle)rawThis).Target;
 	}
+      }
+      
+      // If it doesn't exist then create a new connection around it
+      return new Connection(rawConnection);
     }
 
     public int Timeout
-- 
cgit