EPICS_base/pva2pva
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Syncing softMain.cpp with epics-base

Browse Source
This commit is contained in:
Simon Rose
2021-03-12 13:58:21 +01:00
committed by mdavidsaver
parent ad8b77e19f
commit b515fd30ca
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pdbApp/softMain.cpp
View File

@ -136,6 +136,7 @@ int main(int argc, char *argv[])
xmacro; xmacro;
bool interactive = true; bool interactive = true;
bool loadedDb = false; bool loadedDb = false;
bool ranScript = false;
#ifdef USE_EXECDIR #ifdef USE_EXECDIR
// attempt to compute relative paths // attempt to compute relative paths
@ -240,7 +241,7 @@ int main(int argc, char *argv[])
std::cout<<"# End "<<argv[optind]<<"\n"; std::cout<<"# End "<<argv[optind]<<"\n";
epicsThreadSleep(0.2); epicsThreadSleep(0.2);
loadedDb = true; /* Give it the benefit of the doubt... */ ranScript = true; /* Assume the script has done any necessary initialization */
} }
if (loadedDb) { if (loadedDb) {
@ -259,7 +260,7 @@ int main(int argc, char *argv[])
} }
} else { } else {
if (loadedDb) { if (loadedDb || ranScript) {
epicsThreadExitMain(); epicsThreadExitMain();
} else { } else {