Merge remote-tracking branch 'launchpad/3.14'
* launchpad/3.14: ioc/dbStatic: dbFreeBase() don't double free alias'd records ioc/dbStatic: plug leak in dbFreeBase() ioc/dbStatic: whitespace Fix indentation warning from GCC libCom/test: errlog test more verbose libCom: STATIC_ASSERT use c++11 static_assert when possible Check for empty PV names in Perl catools Conflicts: src/ioc/dbStatic/dbStaticLib.c src/libCom/osi/epicsAssert.h
This commit is contained in:
@@ -169,9 +169,10 @@ static long special(DBADDR *paddr, int after)
|
||||
subRecord *prec = (subRecord *)paddr->precord;
|
||||
|
||||
if (!after) {
|
||||
if (prec->snam[0] == 0 && prec->pact)
|
||||
if (prec->snam[0] == 0 && prec->pact) {
|
||||
prec->pact = FALSE;
|
||||
prec->rpro = FALSE;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user