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

Find: Fix reading settings

Browse Source 
It was not possible to go back to the default filter after other filters
got added to the list. Saving and restoring the current filter was not
symmetric for the default case: When writing, the current value was not
written if it was default, when reading the current value, it was set to
the first value in the list if not set in the settings, instead of the
default.

Fixes: QTCREATORBUG-31676
Change-Id: I5cde924f56744f9142b5cc52b51a9f08d06b3d64
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Eike Ziller
2024-11-04 11:54:30 +01:00
parent f0b6a6c16a
commit d0f082b9ae
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -489,8 +489,7 @@ void BaseFileFind::readCommonSettings(
const QStringList filters = filterSetting.isEmpty() ? QStringList(defaultFilter) const QStringList filters = filterSetting.isEmpty() ? QStringList(defaultFilter)
: filterSetting; : filterSetting;
const QVariant currentFilter = s.value("currentFilter"); const QVariant currentFilter = s.value("currentFilter");
d->m_filterSetting = currentFilter.isValid() ? currentFilter.toString() d->m_filterSetting = currentFilter.isValid() ? currentFilter.toString() : defaultFilter;
: filters.first();
d->m_filterStrings.setStringList(toNativeSeparators(filters)); d->m_filterStrings.setStringList(toNativeSeparators(filters));
if (d->m_filterCombo) if (d->m_filterCombo)
syncComboWithSettings(d->m_filterCombo, d->m_filterSetting); syncComboWithSettings(d->m_filterCombo, d->m_filterSetting);