Skip to content

Commit 6eb4afb

Browse files
natanojlPaul Harrison
authored andcommitted
Fix using ##x## for season and episode in templated text
Fixes #12003. Signed-off-by: Paul Harrison <pharrison@mythtv.org> (cherry picked from commit acdc9f8)
1 parent 4cea476 commit 6eb4afb

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

mythtv/libs/libmythui/mythuibuttonlist.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3508,7 +3508,7 @@ void MythUIButtonListItem::SetToRealButton(MythUIStateType *button, bool selecte
35083508

35093509
QString newText = text->GetTemplateText();
35103510

3511-
QRegExp regexp("%(([^\\|%]+)?\\||\\|(.))?(\\w+)(\\|(.+))?%");
3511+
QRegExp regexp("%(([^\\|%]+)?\\||\\|(.))?(\\S+)(\\|(.+))?%");
35123512
regexp.setMinimal(true);
35133513

35143514
if (!newText.isEmpty() && newText.contains(regexp))

mythtv/libs/libmythui/mythuitext.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ void MythUIText::SetTextFromMap(const InfoMap &map)
196196
if (newText.isEmpty())
197197
newText = GetDefaultText();
198198

199-
QRegExp regexp("%(([^\\|%]+)?\\||\\|(.))?(\\w+)(\\|(.+))?%");
199+
QRegExp regexp("%(([^\\|%]+)?\\||\\|(.))?(\\S+)(\\|(.+))?%");
200200
regexp.setMinimal(true);
201201

202202
if (!newText.isEmpty() && newText.contains(regexp))

0 commit comments

Comments
 (0)