diff options
| author | Mark Spruiell <mes@zeroc.com> | 2011-03-27 11:01:06 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2011-03-27 11:01:06 -0700 |
| commit | 74a83405296350630ac866b6ca780a67bf2063e2 (patch) | |
| tree | 0df28d387a28333c805a951c26b6b35b468c58d4 /cpp/src/Ice/Application.cpp | |
| parent | 4858 - Fix Application in C++/C# to create properties if necessary (diff) | |
| download | ice-74a83405296350630ac866b6ca780a67bf2063e2.tar.bz2 ice-74a83405296350630ac866b6ca780a67bf2063e2.tar.xz ice-74a83405296350630ac866b6ca780a67bf2063e2.zip | |
4919 - Glacier2::Application appName() fix in C++/C#
Diffstat (limited to 'cpp/src/Ice/Application.cpp')
| -rw-r--r-- | cpp/src/Ice/Application.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp index 1185c5f5d61..2dd8d2a050f 100644 --- a/cpp/src/Ice/Application.cpp +++ b/cpp/src/Ice/Application.cpp @@ -308,6 +308,12 @@ Ice::Application::main(int argc, char* argv[], const char* configFile) // We don't call the main below to avoid a deprecated warning // + IceInternal::Application::_appName = ""; + if(argc > 0) + { + IceInternal::Application::_appName = argv[0]; + } + if(argc > 0 && argv[0] && LoggerIPtr::dynamicCast(getProcessLogger())) { setProcessLogger(new LoggerI(argv[0], "")); @@ -619,11 +625,6 @@ Ice::Application::doMain(int argc, char* argv[], const InitializationData& initD try { IceInternal::Application::_interrupted = false; - IceInternal::Application::_appName = ""; - if(argc > 0) - { - IceInternal::Application::_appName = argv[0]; - } // // If the process logger is the default logger, we now replace it with a |