From b515fd30ca5e70b0e6917d15ad6041d8de488042 Mon Sep 17 00:00:00 2001
From: Simon Rose <simon.rose@ess.eu>
Date: Fri, 12 Mar 2021 13:58:21 +0100
Subject: [PATCH] Syncing softMain.cpp with epics-base

---
 pdbApp/softMain.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pdbApp/softMain.cpp b/pdbApp/softMain.cpp
index 3037137..48d32bc 100644
--- a/pdbApp/softMain.cpp
+++ b/pdbApp/softMain.cpp
@@ -136,6 +136,7 @@ int main(int argc, char *argv[])
                     xmacro;
         bool interactive = true;
         bool loadedDb = false;
+        bool ranScript = false;
 
 #ifdef USE_EXECDIR
         // attempt to compute relative paths
@@ -240,7 +241,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) {
@@ -259,7 +260,7 @@ int main(int argc, char *argv[])
             }
 
         } else {
-            if (loadedDb) {
+            if (loadedDb || ranScript) {
                 epicsThreadExitMain();
 
             } else {