diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index d1252c7..159e04e 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,8 @@ +Release 4.1.3 +========== + +* Monitor fix: element no longer queued when overrun in progress. + Release 4.1.2 ========== diff --git a/src/pva/pvaVersion.h b/src/pva/pvaVersion.h index 4b63c18..24b4063 100644 --- a/src/pva/pvaVersion.h +++ b/src/pva/pvaVersion.h @@ -26,7 +26,7 @@ // TODO to be generated, etc. #define EPICS_PVA_MAJOR_VERSION 4 #define EPICS_PVA_MINOR_VERSION 1 -#define EPICS_PVA_MAINTENANCE_VERSION 2 +#define EPICS_PVA_MAINTENANCE_VERSION 3 #define EPICS_PVA_DEVELOPMENT_FLAG 0 namespace epics { diff --git a/src/remoteClient/clientContextImpl.cpp b/src/remoteClient/clientContextImpl.cpp index 8ead845..701939a 100644 --- a/src/remoteClient/clientContextImpl.cpp +++ b/src/remoteClient/clientContextImpl.cpp @@ -2295,7 +2295,8 @@ namespace epics { m_up2datePVStructure = pvStructure; - m_monitorQueue.push(newElement); + if (!m_overrunInProgress) + m_monitorQueue.push(newElement); } if (!m_overrunInProgress)