Mercurial > hg > orthanc
diff OrthancServer/main.cpp @ 1102:ce6386b37afd
avoid unnecessary exceptions on Orthanc startup
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 07 Aug 2014 10:51:35 +0200 |
parents | bb82e5e818e9 |
children | bec1eccf976c |
line wrap: on
line diff
--- a/OrthancServer/main.cpp Thu Aug 07 10:21:43 2014 +0200 +++ b/OrthancServer/main.cpp Thu Aug 07 10:51:35 2014 +0200 @@ -373,28 +373,22 @@ google::InitGoogleLogging("Orthanc"); + const char* configurationFile = NULL; + for (int i = 1; i < argc; i++) + { + // Use the first argument that does not start with a "-" as + // the configuration file + if (argv[i][0] != '-') + { + configurationFile = argv[i]; + } + } + + int status = 0; try { - bool isInitialized = false; - if (argc >= 2) - { - for (int i = 1; i < argc; i++) - { - // Use the first argument that does not start with a "-" as - // the configuration file - if (argv[i][0] != '-') - { - OrthancInitialize(argv[i]); - isInitialized = true; - } - } - } - - if (!isInitialized) - { - OrthancInitialize(); - } + OrthancInitialize(configurationFile); std::string storageDirectoryStr = Configuration::GetGlobalStringParameter("StorageDirectory", "OrthancStorage"); boost::filesystem::path storageDirectory = Configuration::InterpretStringParameterAsPath(storageDirectoryStr);