From 713c2d5080102daa12bea10e27edfb4a373e4d5e Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Fri, 2 Feb 2018 17:47:35 -0600 Subject: [PATCH] Fix for lp: #1747091 generalTimeGetEvent() --- src/libCom/osi/epicsGeneralTime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libCom/osi/epicsGeneralTime.c b/src/libCom/osi/epicsGeneralTime.c index 98c5566f7..c3dcc7646 100644 --- a/src/libCom/osi/epicsGeneralTime.c +++ b/src/libCom/osi/epicsGeneralTime.c @@ -269,7 +269,7 @@ static int generalTimeGetEventPriority(epicsTimeStamp *pDest, int eventNumber, } } } else { - if (epicsTimeGreaterThanEqual(pDest, + if (epicsTimeGreaterThanEqual(&ts, >Pvt.eventTime[eventNumber])) { *pDest = ts; gtPvt.eventTime[eventNumber] = ts; @@ -279,7 +279,6 @@ static int generalTimeGetEventPriority(epicsTimeStamp *pDest, int eventNumber, key = epicsInterruptLock(); gtPvt.ErrorCounts++; epicsInterruptUnlock(key); - } IFDEBUG(10) { char last[40], buff[40]; @@ -291,6 +290,7 @@ static int generalTimeGetEventPriority(epicsTimeStamp *pDest, int eventNumber, " %s, using %s instead\n", ptp->name, buff, last); } + } } break; }