Commit 8056390e authored by Owen Fraser-Green's avatar Owen Fraser-Green

Made proxy DLL names unique

parent 25f384ca
......@@ -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
......
......@@ -72,7 +72,7 @@ namespace DBus
pathName = pathName.TrimStart('/');
this.path = pathName.Split('/');
this.pathName = "/" + pathName;
// Create the vTable and register the path
vTable = new DBusObjectPathVTable(new DBusObjectPathUnregisterFunction(Unregister_Called),
new DBusObjectPathMessageFunction(Message_Called));
......
......@@ -167,7 +167,7 @@ namespace DBus
{
get {
if (this.module == null) {
this.module = ProxyAssembly.DefineDynamicModule(Name, "proxy.dll", true);
this.module = ProxyAssembly.DefineDynamicModule(Name, Name + ".proxy.dll", true);
}
return this.module;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment