From b890d584bce92d8374ca76d09a68c49f9a8fad05 Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Fri, 13 Nov 2020 14:02:03 -0800
Subject: [PATCH] softIoc: avoid extra iocInit()

---
 modules/database/src/std/softIoc/softMain.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/database/src/std/softIoc/softMain.cpp b/modules/database/src/std/softIoc/softMain.cpp
index 97e0a9f4a..cdb0f4a81 100644
--- a/modules/database/src/std/softIoc/softMain.cpp
+++ b/modules/database/src/std/softIoc/softMain.cpp
@@ -129,6 +129,7 @@ int main(int argc, char *argv[])
                     xmacro;
         bool interactive = true;
         bool loadedDb = false;
+        bool ranScript = false;
 
         // attempt to compute relative paths
         {
@@ -228,7 +229,7 @@ int main(int argc, char *argv[])
                 std::cout<<"# End "<<argv[optind]<<"\n";
 
             epicsThreadSleep(0.2);
-            loadedDb = true;    /* Give it the benefit of the doubt... */
+            ranScript = true;    /* Assume the script has done any necessary initialization */
         }
 
         if (loadedDb) {
@@ -247,7 +248,7 @@ int main(int argc, char *argv[])
             }
 
         } else {
-            if (loadedDb) {
+            if (loadedDb || ranScript) {
                 epicsThreadExitMain();
 
             } else {