piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: static text lvobj NULL access

Browse Source
This commit is contained in:
Raphael Coeffic
2022-06-11 15:13:11 +02:00
committed by Raphael Coeffic
parent f8b8232d07
commit f6598a11e4
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/thirdparty/libopenui/src/static.cpp
Vendored
+6 -7
View File
@@ -54,7 +54,7 @@ void StaticText::setText(std::string value)
{
if (text != value) {
text = std::move(value);
lv_label_set_text(lvobj, text.c_str());
if (lvobj) lv_label_set_text(lvobj, text.c_str());
}
}
@@ -66,10 +66,9 @@ const std::string& StaticText::getText() const
void StaticText::setBackgroundColor(LcdFlags color)
{
bgColor = color;
auto actualColor = COLOR_VAL(bgColor);
lv_obj_set_style_bg_color(
lvobj,
lv_color_make(GET_RED(actualColor), GET_GREEN(actualColor),
GET_BLUE(actualColor)),
LV_PART_MAIN);
if (!lvobj) return;
lv_color_t c = makeLvColor(bgColor);
lv_obj_set_style_bg_color(lvobj, c, LV_PART_MAIN);
}