Merge pull request #18 from jimm98y/bugs/fixed-clients-with-same-uri

B Fixed clients with same uri

Author: jimm98y

src/Directory.Build.props

@@ -4,7 +4,7 @@
 		<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
 		<Nullable>disable</Nullable>
 		<Title>$(ProjectName)</Title>
-		<Version>0.1.2</Version>
+		<Version>0.1.3</Version>
 		<Authors>Lukas Volf</Authors>
 		<Copyright>MIT</Copyright>
 		<PackageProjectUrl>https://github.com/jimm98y/SharpOnvif</PackageProjectUrl>

src/OnvifClient/OnvifClient.csproj

@@ -8,12 +8,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\SharpOnvifClient.DeviceMgmt\SharpOnvifClient.DeviceMgmt.csproj" />
-    <ProjectReference Include="..\SharpOnvifClient\SharpOnvifClient.csproj" />
+    <Compile Remove="Properties\**" />
+    <EmbeddedResource Remove="Properties\**" />
+    <None Remove="Properties\**" />
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="Properties\" />
+    <ProjectReference Include="..\SharpOnvifClient.DeviceMgmt\SharpOnvifClient.DeviceMgmt.csproj" />
+    <ProjectReference Include="..\SharpOnvifClient\SharpOnvifClient.csproj" />
   </ItemGroup>
 
 </Project>

src/SharpOnvifClient/SimpleOnvifClient.cs

@@ -68,17 +68,18 @@ public void SetCameraUtcNowOffset(TimeSpan utcNowOffset)
 
         public TClient GetOrCreateClient<TClient, TChannel>(string uri, Func<string, TClient> creator) where TClient : ClientBase<TChannel> where TChannel : class
         {
+            string key = $"{typeof(TClient)}|{uri}";
             lock (_syncRoot)
             {
-                if (_clients.ContainsKey(uri))
+                if (_clients.ContainsKey(key))
                 {
-                    return (TClient)_clients[uri];
+                    return (TClient)_clients[key];
                 }
                 else
                 {
                     var client = creator(uri);
                     client.SetOnvifAuthentication(_authentication, _credentials, _legacyAuth);
-                    _clients.Add(uri, client);
+                    _clients.Add(key, client);
                     return client;
                 }
             }