Mirrors_Framework/g2
1
0
Fork 0
mirror of https://github.com/synthetos/g2.git synced 2026-09-21 18:56:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix merge error: check coolant outputs before using

Browse Source
This commit is contained in:
Rob Giseburt
2019-10-15 21:41:27 -05:00
parent 9a16446fde
commit fb29eb17b6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
g2core/coolant.cpp
+2 -2
View File
@@ -181,7 +181,7 @@ stat_t co_set_coph(nvObj_t *nv)
stat_t co_get_comp(nvObj_t *nv) { return(get_integer(nv, coolant.mist.polarity)); }
stat_t co_set_comp(nvObj_t *nv) {
stat_t ret = set_integer(nv, (uint8_t &)coolant.mist.polarity, 0, 1);
if (ret == STAT_OK) {
if (ret == STAT_OK && coolant.mist.output) {
coolant.mist.output->setPolarity((ioPolarity) coolant.mist.polarity);
}
return ret;
@@ -189,7 +189,7 @@ stat_t co_set_comp(nvObj_t *nv) {
stat_t co_get_cofp(nvObj_t *nv) { return(get_integer(nv, coolant.flood.polarity)); }
stat_t co_set_cofp(nvObj_t *nv) {
stat_t ret = set_integer(nv, (uint8_t &)coolant.flood.polarity, 0, 1);
if (ret == STAT_OK) {
if (ret == STAT_OK && coolant.flood.output) {
coolant.flood.output->setPolarity((ioPolarity) coolant.flood.polarity);
}
return ret;