feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TextEditor: Correctly restore empty pattern

Browse Source 
Only default to first entry when the pattern was never set.

Change-Id: I4d2a76218347adb4aa28ef3e8fd0e81485faf184
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2016-03-30 12:36:48 +03:00
committed by Orgad Shaneh
parent d7b648abdb
commit c176771696
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/texteditor/basefilefind.cpp
View File

@@ -285,10 +285,11 @@ void BaseFileFind::writeCommonSettings(QSettings *settings)
void BaseFileFind::readCommonSettings(QSettings *settings, const QString &defaultFilter) void BaseFileFind::readCommonSettings(QSettings *settings, const QString &defaultFilter)
{ {
QStringList filters = settings->value(QLatin1String("filters")).toStringList(); QStringList filters = settings->value(QLatin1String("filters")).toStringList();
d->m_filterSetting = settings->value(QLatin1String("currentFilter")).toString(); const QVariant currentFilter = settings->value(QLatin1String("currentFilter"));
d->m_filterSetting = currentFilter.toString();
if (filters.isEmpty()) if (filters.isEmpty())
filters << defaultFilter; filters << defaultFilter;
if (d->m_filterSetting.isEmpty()) if (!currentFilter.isValid())
d->m_filterSetting = filters.first(); d->m_filterSetting = filters.first();
d->m_filterStrings.setStringList(filters); d->m_filterStrings.setStringList(filters);
if (d->m_filterCombo) if (d->m_filterCombo)