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

Core: Handle an invalid theme id from the settings

Browse Source 
Don't crash if the settings contain an outdated/invalid "CreatorTheme"
entry.

This change makes ThemeEntry::themeSetting() validate the entry. If no
theme with that id exists, it returs the default/first theme instead.

Task-number: QTCREATORBUG-17517
Change-Id: I87658fade33ba4d956d3a4c5591dd86db4051426
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Alessandro Portale
2017-04-11 12:30:59 +02:00
parent 4fcbf91d30
commit bc35392123
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/coreplugin/themechooser.cpp
View File

@@ -221,8 +221,16 @@ QList<ThemeEntry> ThemeEntry::availableThemes()
Id ThemeEntry::themeSetting()
{
return Id::fromSetting(ICore::settings()->value(QLatin1String(Constants::SETTINGS_THEME),
QLatin1String(Constants::DEFAULT_THEME)));
const Id setting =
Id::fromSetting(ICore::settings()->value(QLatin1String(Constants::SETTINGS_THEME),
QLatin1String(Constants::DEFAULT_THEME)));
const QList<ThemeEntry> themes = availableThemes();
if (themes.empty())
return Id();
const bool settingValid = Utils::contains(themes, Utils::equal(&ThemeEntry::id, setting));
return settingValid ? setting : themes.first().id();
}
Theme *ThemeEntry::createTheme(Id id)