From 6e3aa77c42bd8f4b764b30d8a055ece6aeeb745d Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Sun, 3 Jun 2018 11:18:40 -0500 Subject: [PATCH] lnkCalc fix: Don't evaluate minor expression when major returned true --- src/std/link/lnkCalc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/std/link/lnkCalc.c b/src/std/link/lnkCalc.c index fa1a363fe..2ac568840 100644 --- a/src/std/link/lnkCalc.c +++ b/src/std/link/lnkCalc.c @@ -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);