epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

lnkCalc fix: Don't evaluate minor expression when major returned true

Browse Source
This commit is contained in:
Andrew Johnson
2018-06-03 11:18:40 -05:00
parent 2fb46fc541
commit 6e3aa77c42
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/std/link/lnkCalc.c
View File

@@ -600,7 +600,7 @@ static long lnkCalc_getValue(struct link *plink, short dbrType, void *pbuffer,
}
}
if (!status && clink->post_minor) {
if (!status && !clink->sevr && clink->post_minor) {
double alval = clink->val;
status = calcPerform(clink->arg, &alval, clink->post_minor);
@@ -664,7 +664,7 @@ static long lnkCalc_putValue(struct link *plink, short dbrType,
}
}
if (!status && clink->post_minor) {
if (!status && !clink->sevr && clink->post_minor) {
double alval = clink->val;
status = calcPerform(clink->arg, &alval, clink->post_minor);