Skip to content

Commit 03eaf3b

Browse files
committed
Icon Downloader: Fix improper escaping of search string that broke proper matching and sorting with some searches
(cherry picked from commit 93f4b96)
1 parent edc162b commit 03eaf3b

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

mythtv/programs/mythtv-setup/importicons.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ void ImportIconsWizard::enableControls(dialogState state, bool selectEnabled)
165165
void ImportIconsWizard::manualSearch()
166166
{
167167
QString str = m_manualEdit->GetText();
168-
if (!search(escape_csv(str)))
169-
m_statusText->SetText(tr("No matches found for %1") .arg(str));
168+
if (!search(str))
169+
m_statusText->SetText(tr("No matches found for \"%1\"").arg(str));
170170
else
171171
m_statusText->Reset();
172172
}
@@ -476,7 +476,7 @@ bool ImportIconsWizard::doLoad()
476476
m_nameText->SetText(tr("Choose icon for channel %1")
477477
.arg((*m_missingIter).strName));
478478
m_manualEdit->SetText((*m_missingIter).strName);
479-
if (!search((*m_missingIter).strNameCSV))
479+
if (!search((*m_missingIter).strName))
480480
m_statusText->SetText(tr("No matches found for %1")
481481
.arg((*m_missingIter).strName));
482482
else

0 commit comments

Comments
 (0)