fix(color): radio may crash if model yaml file does not contain any screen definitions (#6916)
This commit is contained in:
@@ -197,6 +197,11 @@ void ModelData::cfsSetOffColorLuaOverride(uint8_t n, bool v) {
|
|||||||
static TopBarPersistentData _topbarData;
|
static TopBarPersistentData _topbarData;
|
||||||
static CustomScreenData* _screenData[MAX_CUSTOM_SCREENS];
|
static CustomScreenData* _screenData[MAX_CUSTOM_SCREENS];
|
||||||
|
|
||||||
|
bool ModelData::hasScreenData(int screenNum)
|
||||||
|
{
|
||||||
|
return _screenData[screenNum] != nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
CustomScreenData* ModelData::getScreenData(int screenNum)
|
CustomScreenData* ModelData::getScreenData(int screenNum)
|
||||||
{
|
{
|
||||||
if (_screenData[screenNum] == nullptr) {
|
if (_screenData[screenNum] == nullptr) {
|
||||||
|
|||||||
@@ -835,6 +835,7 @@ PACK(struct ModelData {
|
|||||||
const char* getScreenLayoutId(int screenNum);
|
const char* getScreenLayoutId(int screenNum);
|
||||||
void setScreenLayoutId(int screenNum, const char* s);
|
void setScreenLayoutId(int screenNum, const char* s);
|
||||||
TopBarPersistentData* getTopbarData();
|
TopBarPersistentData* getTopbarData();
|
||||||
|
bool hasScreenData(int screenNum);
|
||||||
CustomScreenData* getScreenData(int screenNum);
|
CustomScreenData* getScreenData(int screenNum);
|
||||||
LayoutPersistentData* getScreenLayoutData(int screenNum);
|
LayoutPersistentData* getScreenLayoutData(int screenNum);
|
||||||
WidgetPersistentData* getWidgetData(int screenNum, int zoneNum);
|
WidgetPersistentData* getWidgetData(int screenNum, int zoneNum);
|
||||||
|
|||||||
@@ -161,6 +161,9 @@ static void sanitizeMixerLines()
|
|||||||
void postModelLoad(bool alarms)
|
void postModelLoad(bool alarms)
|
||||||
{
|
{
|
||||||
#if defined(COLORLCD)
|
#if defined(COLORLCD)
|
||||||
|
if (!g_model.hasScreenData(0))
|
||||||
|
LayoutFactory::loadDefaultLayout();
|
||||||
|
|
||||||
if (g_model.topbarWidgetWidth[0] == 0) {
|
if (g_model.topbarWidgetWidth[0] == 0) {
|
||||||
// Set default width for top bar widgets
|
// Set default width for top bar widgets
|
||||||
for (int i = 0; i < MAX_TOPBAR_ZONES; i += 1)
|
for (int i = 0; i < MAX_TOPBAR_ZONES; i += 1)
|
||||||
|
|||||||
Reference in New Issue
Block a user