X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fcore%2Fapplication.cpp;h=f4887e756ff2ca64811b37bb7093c06157ff59b8;hp=3a5561eb5f6d6db8b62b488ab3c7c81132384812;hb=231482c618cb2b30e1f7194d8d1d3ea30bc94512;hpb=c0d3fd58fd25e4627a6f8d64a22c5800e783ce07 diff --git a/source/core/application.cpp b/source/core/application.cpp index 3a5561e..f4887e7 100644 --- a/source/core/application.cpp +++ b/source/core/application.cpp @@ -2,6 +2,7 @@ #include #include #include +#include #include #include "application.h" #include "getopt.h" @@ -12,13 +13,20 @@ namespace Msp { Application *Application::app_ = 0; Application::Starter *Application::starter_ = 0; +const char *Application::argv0_ = 0; +string Application::name_; void *Application::data_ = 0; -Application::Application(): +Application::Application(const string &n): exit_code(0) { if(app_) throw logic_error("instance already exists"); + + if(!n.empty()) + name_ = n; + else + name_ = FS::basename(argv0_); } int Application::run(int argc, char **argv, void *data, void (*created_callback)(void *)) @@ -29,6 +37,7 @@ int Application::run(int argc, char **argv, void *data, void (*created_callback) return 126; } + argv0_ = argv[0]; data_ = data; try