diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2016-03-30 12:36:48 +0300 |
---|---|---|
committer | Orgad Shaneh <orgads@gmail.com> | 2016-03-30 11:28:22 +0000 |
commit | c176771696c41201fbc7334b29900ed5c61254f0 (patch) | |
tree | 3609e26df33e3084bb54adda6248ce1ff9525853 /src/plugins/texteditor/basefilefind.cpp | |
parent | d7b648abdb4bb27dcd65df1545c0b11b4f9ed896 (diff) |
TextEditor: Correctly restore empty pattern
Only default to first entry when the pattern was never set.
Change-Id: I4d2a76218347adb4aa28ef3e8fd0e81485faf184
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/plugins/texteditor/basefilefind.cpp')
-rw-r--r-- | src/plugins/texteditor/basefilefind.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp index facac8a9c0..66d1e1f445 100644 --- a/src/plugins/texteditor/basefilefind.cpp +++ b/src/plugins/texteditor/basefilefind.cpp @@ -285,10 +285,11 @@ void BaseFileFind::writeCommonSettings(QSettings *settings) void BaseFileFind::readCommonSettings(QSettings *settings, const QString &defaultFilter) { 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()) filters << defaultFilter; - if (d->m_filterSetting.isEmpty()) + if (!currentFilter.isValid()) d->m_filterSetting = filters.first(); d->m_filterStrings.setStringList(filters); if (d->m_filterCombo) |