softIoc: avoid extra iocInit()

This commit is contained in:
Michael Davidsaver
2020-11-13 14:02:03 -08:00
parent db2f7d8b92
commit b890d584bc

View File

@@ -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 {