pvr: fix issue #521. Problems with settings of type number and file

opdenkamp · Jun 15, 2012 · 83d33d2 · 83d33d2
1 parent 099e986
commit 83d33d2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/xbmc/addons/AddonCallbacksAddon.cpp b/xbmc/addons/AddonCallbacksAddon.cpp
@@ -169,7 +169,7 @@ bool CAddonCallbacksAddon::GetAddonSetting(void *addonData, const char *strSetti
               strcmpi(type, "folder") == 0 || strcmpi(type, "action")    == 0 ||
               strcmpi(type, "music")  == 0 || strcmpi(type, "pictures")  == 0 ||
               strcmpi(type, "folder") == 0 || strcmpi(type, "programs")  == 0 ||
-              strcmpi(type, "files")  == 0 || strcmpi(type, "fileenum")  == 0)
+              strcmpi(type, "file")  == 0 || strcmpi(type, "fileenum")  == 0)
           {
             strcpy((char*) settingValue, addonHelper->m_addon->GetSetting(id).c_str());
             return true;

diff --git a/xbmc/addons/AddonDll.h b/xbmc/addons/AddonDll.h
@@ -419,11 +419,11 @@ ADDON_STATUS CAddonDll<TheDll, TheStruct, TheProps>::TransferSettings()
           strcmpi(type, "folder") == 0 || strcmpi(type, "action") == 0 ||
           strcmpi(type, "music") == 0 || strcmpi(type, "pictures") == 0 ||
           strcmpi(type, "folder") == 0 || strcmpi(type, "programs") == 0 ||
-          strcmpi(type, "files") == 0 || strcmpi(type, "fileenum") == 0)
+          strcmpi(type, "file") == 0 || strcmpi(type, "fileenum") == 0)
         {
           status = m_pDll->SetSetting(id, (const char*) GetSetting(id).c_str());
         }
-        else if (strcmpi(type, "integer") == 0 || strcmpi(type, "enum") == 0 ||
+        else if (strcmpi(type, "number") == 0 || strcmpi(type, "enum") == 0 ||
           strcmpi(type, "labelenum") == 0 || strcmpi(type, "rangeofnum") == 0)
         {
           int tmp = atoi(GetSetting(id));