Merge branch 'Leia' into Matrix

rbuehlma · Apr 15, 2020 · 26b9d6f · 26b9d6f
2 parents 167bab2 + b81a303
commit 26b9d6f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/pvr.zattoo/addon.xml.in b/pvr.zattoo/addon.xml.in
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon id="pvr.zattoo"
-       version="19.2.16"
+       version="19.2.17"
        name="Zattoo PVR Client"
        provider-name="trummerjo,rbuehlma">
   <requires>
@@ -32,6 +32,8 @@
       <fanart>fanart.jpg</fanart>
     </assets>
     <news>
+v19.2.17
+ - Warn missing categories only once
 v19.2.16
  - Fix Zattoo login
 v19.2.15
@@ -86,6 +88,8 @@ v19.0.1
  - Load description from xmltv file
 v19.0.0
  - Update to PVR addon API v6.0.0
+v18.1.16
+ - Warn missing categories only once
 v18.1.15
  - Fix Zattoo login
 v18.1.14

diff --git a/src/categories.cpp b/src/categories.cpp
@@ -67,7 +67,7 @@ std::string Categories::Category(int category) const
   return "";
 }
 
-int Categories::Category(const std::string& category) const
+int Categories::Category(const std::string& category)
 {
   if (category.empty()) {
     return 0;
@@ -76,6 +76,7 @@ int Categories::Category(const std::string& category) const
   if (it != m_categoriesByName.end())
     return it->second;
   XBMC->Log(LOG_NOTICE, "Missing category: %s", category.c_str());
+  m_categoriesByName[category]=0;
   return 0;
 }
 

diff --git a/src/categories.h b/src/categories.h
@@ -33,7 +33,7 @@ class Categories
   Categories();
 
   std::string Category(int category) const;
-  int Category(const std::string& category) const;
+  int Category(const std::string& category);
 
 private:
   void LoadEITCategories();