summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY1
-rw-r--r--common.c8
2 files changed, 8 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index 5682ca8..afa7646 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8,6 +8,7 @@ VDR Plugin 'text2skin' Revision History
- Added experimental RELAX NG schema for skin XML files.
- Set minimum value of bitmap cache size in menu to 1.
- Fix bitmap cache size initialization when built with gcc 4.6.
+- Update epgsearch recording search timer name parsing for epgsearch >= 0.9.21.
- Warning and code cleanups.
2010-06-21: Version 1.3.1
diff --git a/common.c b/common.c
index 5b62fc7..ea74be3 100644
--- a/common.c
+++ b/common.c
@@ -197,8 +197,14 @@ std::string AddExtInfoToDescription(const char *Title, const char *ShortText, co
if (!desc.str().empty())
desc << "\n";
desc << tr("AUXILIARY INFOS") << ":\n";
+ std::string searchTimer = StripXmlTag(auxEpgsearch, "searchtimer");
+ if (searchTimer.empty())
+ // epgsearch < 0.9.21?
+ searchTimer = StripXmlTag(auxEpgsearch, "Search timer");
+ if (searchTimer.empty())
+ searchTimer = auxEpgsearch;
std::stringstream buf;
- buf << " - " << tr("Search timer") << ": " << StripXmlTag(auxRaw, "Search timer");
+ buf << " - " << tr("Search timer") << ": " << searchTimer;
desc << FitToWidth(buf, MAX_CHARS) << "\n";
}
}