Skip to content

fix: don't assume that successful weightFromArg links to valid index #7084

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PastaPastaPasta merged 1 commit into from
Dec 30, 2025
Merged

fix: don't assume that successful weightFromArg links to valid index #7084

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions src/qt/optionsmodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,16 +564,22 @@ QVariant OptionsModel::data(const QModelIndex & index, int role) const
case FontScale:
return settings.value("fontScale");
case FontWeightNormal: {
QFont::Weight weight{GUIUtil::g_font_registry.GetWeightNormalDefault()};
GUIUtil::weightFromArg(settings.value("fontWeightNormal").toInt(), weight);
int nIndex = GUIUtil::g_font_registry.WeightToIdx(weight);
int nIndex = [&]() -> int {
if (QFont::Weight weight; GUIUtil::weightFromArg(settings.value("fontWeightNormal").toInt(), weight) && GUIUtil::g_font_registry.IsValidWeight(weight)) {
return GUIUtil::g_font_registry.WeightToIdx(weight);
}
return GUIUtil::g_font_registry.WeightToIdx(GUIUtil::g_font_registry.GetWeightNormalDefault());
}();
assert(nIndex != -1);
return nIndex;
}
case FontWeightBold: {
QFont::Weight weight{GUIUtil::g_font_registry.GetWeightBoldDefault()};
GUIUtil::weightFromArg(settings.value("fontWeightBold").toInt(), weight);
int nIndex = GUIUtil::g_font_registry.WeightToIdx(weight);
int nIndex = [&]() -> int {
if (QFont::Weight weight; GUIUtil::weightFromArg(settings.value("fontWeightBold").toInt(), weight) && GUIUtil::g_font_registry.IsValidWeight(weight)) {
return GUIUtil::g_font_registry.WeightToIdx(weight);
}
return GUIUtil::g_font_registry.WeightToIdx(GUIUtil::g_font_registry.GetWeightBoldDefault());
}();
assert(nIndex != -1);
return nIndex;
}
Expand Down
Loading