From c176771696c41201fbc7334b29900ed5c61254f0 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Wed, 30 Mar 2016 12:36:48 +0300 Subject: [PATCH] TextEditor: Correctly restore empty pattern Only default to first entry when the pattern was never set. Change-Id: I4d2a76218347adb4aa28ef3e8fd0e81485faf184 Reviewed-by: Tobias Hunger --- src/plugins/texteditor/basefilefind.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/texteditor/basefilefind.cpp b/src/plugins/texteditor/basefilefind.cpp index facac8a9c05..66d1e1f4457 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)