diff --git a/Changelog b/Changelog index 793d091b6..a3987e866 100644 --- a/Changelog +++ b/Changelog @@ -4,6 +4,7 @@ - BUGFIX: Fix scan directories saving (closes #694768) - BUGFIX: Remove empty folders on torrent soft deletion (closes #695174) - BUGFIX: Make sure the main window has focus on startup + - BUGFIX: Fix ampersand display in search tabs (closes #695715) * Sun Dec 19 2010 - Christophe Dumez - v2.5.2 - BUGFIX: Fix alternative speed icon staying pressed when disabled diff --git a/src/searchengine/searchengine.cpp b/src/searchengine/searchengine.cpp index 20b5897d0..7fe28d33d 100644 --- a/src/searchengine/searchengine.cpp +++ b/src/searchengine/searchengine.cpp @@ -313,7 +313,7 @@ void SearchEngine::on_search_button_clicked(){ // Reload environment variables (proxy) searchProcess->setEnvironment(QProcess::systemEnvironment()); - QString pattern = search_pattern->text().trimmed(); + const QString pattern = search_pattern->text().trimmed(); // No search pattern entered if(pattern.isEmpty()){ QMessageBox::critical(0, tr("Empty search pattern"), tr("Please type a search pattern first")); @@ -323,7 +323,9 @@ void SearchEngine::on_search_button_clicked(){ currentSearchTab=new SearchTab(this); connect(currentSearchTab->header(), SIGNAL(sectionResized(int, int, int)), this, SLOT(propagateSectionResized(int,int,int))); all_tab.append(currentSearchTab); - tabWidget->addTab(currentSearchTab, pattern); + QString tabName = pattern; + tabName.replace(QRegExp("&{1}"), "&&"); + tabWidget->addTab(currentSearchTab, tabName); tabWidget->setCurrentWidget(currentSearchTab); #if QT_VERSION < 0x040500 closeTab_button->setEnabled(true);