Merge pull request #2 from AlphaCentaury/v1.5-alpha-4

Fixes #1
AlphaCentaury · Aug 2, 2016 · 0b7316d · 0b7316d
2 parents bffee6c + 05e8f88
commit 0b7316d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/1.5 'Kruger 60'/Logos/Services/domain-mappings.xml b/1.5 'Kruger 60'/Logos/Services/domain-mappings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Logos-Domains xmlns="http://movistartv.codeplex.com/schema/2015:Configuration:Mappings">
   <Package name="&lt;default&gt;">
-    <Mapping domainName="DVB-IPTV" mandatory="true">generic</Mapping>
+    <Mapping domainName="IPTV" mandatory="true">generic</Mapping>
   </Package>
   <Package name="movistarTV">
     <Mapping domainName="DEM_1.imagenio.es" mandatory="false">imagenio.es</Mapping>

diff --git a/1.5 'Kruger 60'/UiServices.Config/Logos/ServiceLogoMappings.cs b/1.5 'Kruger 60'/UiServices.Config/Logos/ServiceLogoMappings.cs
@@ -165,14 +165,25 @@ public ServiceLogo Get(string serviceDomainName, string providerDomain, string s
 
                 partialPath = GetFolderForDomain((serviceLogos.DomainRedirection == null) ? serviceDomainName : serviceLogos.DomainRedirection);
 
-                return new ServiceLogo(BasePathLogos, partialPath, logoFile,
-                    string.Format(Properties.InvariantTexts.FormatServiceLogoKey, logoFile, partialPath));
+                return GetLogo(partialPath, logoFile);
             } // while
 
-            // obtain default icon
+            // avoid infinite recursion if default domain name contains no logos or doesn't exists
+            if (providerDomain == Properties.InvariantTexts.DefaultDomainNameServiceLogo)
+            {
+                return GetLogo("unknown", "unknown");
+            } // if
+
+            // obtain default logo
             return Get(null, Properties.InvariantTexts.DefaultDomainNameServiceLogo, serviceTypeId, serviceTypeId);
         } // Get
 
+        ServiceLogo GetLogo(string partialPath, string logoFile)
+        {
+            return new ServiceLogo(BasePathLogos, partialPath, logoFile,
+                    string.Format(Properties.InvariantTexts.FormatServiceLogoKey, logoFile, partialPath));
+        } // GetLogo
+
         public ServiceLogo FromServiceKey(string serviceKey)
         {
             int pos;

diff --git a/1.5 'Kruger 60'/UiServices.Config/Properties/InvariantTexts.Designer.cs b/1.5 'Kruger 60'/UiServices.Config/Properties/InvariantTexts.Designer.cs
diff --git a/1.5 'Kruger 60'/UiServices.Config/Properties/InvariantTexts.resx b/1.5 'Kruger 60'/UiServices.Config/Properties/InvariantTexts.resx
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="DefaultDomainNameProviderLogo" xml:space="preserve">
-    <value>IPTV</value>
+    <value>DBV-IPTV</value>
   </data>
   <data name="DefaultDomainNameServiceLogo" xml:space="preserve">
     <value>IPTV</value>