jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-27 13:16:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check hasp_local_style_attr last

Browse Source
This commit is contained in:
fvanroie 2021-05-18 00:16:51 +02:00
parent 968a78f3a3
commit b926e984e3
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/hasp/hasp_attribute.cpp
View File

@ -1971,13 +1971,7 @@ void hasp_process_obj_attribute(lv_obj_t* obj, const char* attribute, const char
break; break;
default: { default: {
bool result; break; // not found
hasp_local_style_attr(obj, attribute, attr_hash, payload, update, result);
if(result) {
ret = ATTR_TYPE_METHOD_OK;
} else {
ret = ATTR_NOT_FOUND;
}
} }
} }
@ -2017,6 +2011,16 @@ void hasp_process_obj_attribute(lv_obj_t* obj, const char* attribute, const char
} }
} }
if(ret == ATTR_NOT_FOUND) {
bool result;
hasp_local_style_attr(obj, attribute, attr_hash, payload, update, result);
if(result) {
ret = ATTR_TYPE_METHOD_OK;
} else {
ret = ATTR_NOT_FOUND;
}
}
// Positive return codes have returned a value, negative are warnings // Positive return codes have returned a value, negative are warnings
if(update && ret > 0) return; // done if(update && ret > 0) return; // done