X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fcore%2Fapplication.cpp;h=0ef9507a14275af33fadbd1a73f190528e8f1601;hp=3a5561eb5f6d6db8b62b488ab3c7c81132384812;hb=ce0b610396aa8f760462fa4d7a6bb207a43994d2;hpb=dd997d45dd774b1d6734a19c6eb6efdd6be14234

diff --git a/source/core/application.cpp b/source/core/application.cpp
index 3a5561e..0ef9507 100644
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -2,6 +2,7 @@
 #include <signal.h>
 #include <msp/debug/demangle.h>
 #include <msp/debug/errorreporter.h>
+#include <msp/fs/utils.h>
 #include <msp/io/print.h>
 #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,7 +37,7 @@ int Application::run(int argc, char **argv, void *data, void (*created_callback)
 		return 126;
 	}
 
-	data_ = data;
+	set_startup_info(argv[0], data);
 
 	try
 	{
@@ -72,6 +80,15 @@ int Application::run(int argc, char **argv, void *data, void (*created_callback)
 	}
 }
 
+void Application::set_startup_info(const char *argv0, void *data)
+{
+	if(argv0_)
+		throw logic_error("startup info already set");
+
+	argv0_ = argv0;
+	data_ = data;
+}
+
 int Application::main()
 {
 	done = false;