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

fix(color): Deleting empty label caused EM/Hang (#2392)

Browse Source 
* If deleting a label, don't check size

* If rename to blank, do nothing
This commit is contained in:
Cliff
2022-09-28 18:19:59 +10:00
committed by GitHub
parent 6fd69f8053
commit ac091b779d
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/storage/modelslist.cpp
+9 -5
View File
@@ -616,15 +616,19 @@ bool ModelMap::renameLabel(const std::string &from, std::string to,
if (from == "") return true;
DEBUG_TIMER_START(debugTimerYamlScan);
// Limit max label name. TODO: Warn user they entered too long of a string
to = to.substr(0, LABEL_LENGTH);
removeYAMLChars(to);
if(to.size() == 0) return true;
if(to.size() > 0) { // Ignore check if deleting a label, size will be zero
to = to.substr(0, LABEL_LENGTH); // Limit max label name. TODO: Warn user they entered too long of a string
removeYAMLChars(to); // Remove special chars
if(to.size() == 0 || from == to) { // Abort rename if no chars left or same
if (progress != nullptr) progress("", 100); // Kill progress dialog
return true;
}
}
ModelData *modeldata = (ModelData *)malloc(sizeof(ModelData));
if (!modeldata) {
TRACE("Labels: Out Of Memory");
if (progress != nullptr) progress("", 100); // Kill progress dialog
return true;
}