summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conflictcheckonly.c10
-rw-r--r--doc-src/en/epgsearch.4.txt2
2 files changed, 6 insertions, 6 deletions
diff --git a/conflictcheckonly.c b/conflictcheckonly.c
index 1f04747..e0d5ae9 100644
--- a/conflictcheckonly.c
+++ b/conflictcheckonly.c
@@ -207,13 +207,13 @@ const char *cPluginConflictcheckonly::MainMenuText(void)
if (epgSearchPlugin->Service("Epgsearch-lastconflictinfo-v1.0", serviceData)) {
if (serviceData->relevantConflicts > 0) {
free(_menuText);
- asprintf(&_menuText, "%s (%d, %s: %s)", menuText, serviceData->relevantConflicts,
+ if (asprintf(&_menuText, "%s (%d, %s: %s)", menuText, serviceData->relevantConflicts,
#if APIVERSNUM < 10507
- tr("next"), *DateTime(serviceData->nextConflict));
+ tr("next"), *DateTime(serviceData->nextConflict)))
#else
- I18nTranslate("next", I18nEpgsearch), *DateTime(serviceData->nextConflict));
-#endif
- menuText = _menuText;
+ I18nTranslate("next", I18nEpgsearch), *DateTime(serviceData->nextConflict)))
+#endif
+ menuText = _menuText;
}
}
delete serviceData;
diff --git a/doc-src/en/epgsearch.4.txt b/doc-src/en/epgsearch.4.txt
index e275329..9f50c94 100644
--- a/doc-src/en/epgsearch.4.txt
+++ b/doc-src/en/epgsearch.4.txt
@@ -130,7 +130,7 @@ is B<':'>:
29 - avoid repeats? 0/1
30 - allowed repeats
31 - compare title when testing for a repeat? 0/1
- 32 - compare subtitle when testing for a repeat? 0/1
+ 32 - compare subtitle when testing for a repeat? 0=no/1=yes/2=yes-if present
33 - compare description when testing for a repeat? 0/1
34 - compare extended EPG info when testing for a repeat?
This entry is a bit field of the category IDs.