From d6741450f380c4c7e4c8c08d9397ad8d6493a370 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Thu, 6 Oct 2022 08:10:48 +0200 Subject: [PATCH] fix(color): set current model after label update (#2476) * fix(color): set current model after label update Fixes #2460 Here Companion only outputs a more or less empty labels file, so that models are scanned on startup, however not setting the current model properly in this particular case. * fix(color): bitmap name in modelslist should be zero terminated --- radio/src/storage/modelslist.cpp | 2 ++ radio/src/storage/modelslist.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/radio/src/storage/modelslist.cpp b/radio/src/storage/modelslist.cpp index f46119559..3694b2ec8 100644 --- a/radio/src/storage/modelslist.cpp +++ b/radio/src/storage/modelslist.cpp @@ -1144,6 +1144,8 @@ bool ModelsList::loadYaml() modelslist.push_back(model); filehash.celladded = true; model->_isDirty = true; + if(filehash.curmodel == true) + modelslist.setCurrentModel(model); } } diff --git a/radio/src/storage/modelslist.h b/radio/src/storage/modelslist.h index 14ddb30c7..89909f57e 100644 --- a/radio/src/storage/modelslist.h +++ b/radio/src/storage/modelslist.h @@ -77,7 +77,7 @@ class ModelCell char modelName[LEN_MODEL_NAME + 1] = ""; char modelFinfoHash[FILE_HASH_LENGTH + 1] = ""; #if LEN_BITMAP_NAME > 0 - char modelBitmap[LEN_BITMAP_NAME] = ""; + char modelBitmap[LEN_BITMAP_NAME + 1] = ""; #endif gtime_t lastOpened = 0; bool _isDirty = true;