From 73c25448d059742722306eb93c8dea4e2f5bd959 Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Wed, 11 Dec 2024 17:01:22 -0800 Subject: [PATCH] oops... didn't fully test 8502f91bb9d7cb8fef79300a3206897d2320b36d --- ioc/groupsourcehooks.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ioc/groupsourcehooks.cpp b/ioc/groupsourcehooks.cpp index 3e95cd9..8a2bd89 100644 --- a/ioc/groupsourcehooks.cpp +++ b/ioc/groupsourcehooks.cpp @@ -106,9 +106,6 @@ long dbLoadGroup(const char* jsonFilename, const char* macros) { #if EPICS_VERSION_INT >= VERSION_INT(7, 0, 4, 0) \ || (EPICS_VERSION_INT < VERSION_INT(7, 0, 0, 0) && EPICS_VERSION_INT >= VERSION_INT(3, 15, 8, 0)) if(getIocState() != iocVoid) -#else - if(interruptAccept) -#endif { fprintf(stderr, ERL_ERROR " dbLoadGroup() not allowed in current IOC state (%d).\n" @@ -117,6 +114,15 @@ long dbLoadGroup(const char* jsonFilename, const char* macros) { ); return 1; } +#else + if(interruptAccept) + { + fprintf(stderr, + ERL_ERROR " dbLoadGroup() not allowed in current IOC state.\n" + " Hint: Move before iocInit()\n"); + return 1; + } +#endif if (!jsonFilename || !jsonFilename[0]) { fprintf(stderr, "%s\n"