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

diff --git a/source/core/application.cpp b/source/core/application.cpp
index 0ef9507..aedaa4b 100644
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -1,7 +1,10 @@
+#include <cstring>
 #include <typeinfo>
 #include <signal.h>
 #include <msp/debug/demangle.h>
 #include <msp/debug/errorreporter.h>
+#include <msp/fs/dir.h>
+#include <msp/fs/path.h>
 #include <msp/fs/utils.h>
 #include <msp/io/print.h>
 #include "application.h"
@@ -85,7 +88,24 @@ void Application::set_startup_info(const char *argv0, void *data)
 	if(argv0_)
 		throw logic_error("startup info already set");
 
-	argv0_ = argv0;
+	static FS::Path exe;
+
+	if(!argv0 || !*argv0)
+	{
+#ifdef _WIN32
+		argv0 = "application.exe";
+#else
+		argv0 = "./application";
+#endif
+	}
+
+	bool has_slash = strchr(argv0, FS::DIRSEP);
+	if(!has_slash)
+		exe = FS::path_lookup(argv0);
+	if(exe.empty())
+		exe = FS::realpath(argv0);
+
+	argv0_ = exe.c_str();
 	data_ = data;
 }