Use C++11 features with containers

[libs/core.git] / source / core / application.cpp

diff --git a/source/core/application.cpp b/source/core/application.cpp
index 1bae2cd68d06c1028c08e8690dbe585c79b6eb9c..2c6dc967296edeba82336d724096650b4db34a94 100644 (file)
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -7,6 +7,7 @@
 #include <msp/fs/path.h>
 #include <msp/fs/utils.h>
 #include <msp/io/print.h>
+#include <msp/strings/utils.h>
 #include "application.h"
 #include "getopt.h"
 
@@ -73,7 +74,15 @@ int Application::run(int argc, char **argv, void *data, void (*created_callback)
                {
                        IO::print(IO::cerr, "An uncaught exception occurred.\n");
                        IO::print(IO::cerr, "  type:   %s\n", Debug::demangle(typeid(e).name()));
-                       IO::print(IO::cerr, "  what(): %s\n", e.what());
+                       vector<string> lines = split(e.what(), '\n');
+                       if(lines.size()<2)
+                               IO::print(IO::cerr, "  what(): %s\n", e.what());
+                       else
+                       {
+                               IO::print(IO::cerr, "  what(): %s\n", lines.front());
+                               for(auto i=lines.begin(); ++i!=lines.end(); )
+                                       IO::print(IO::cerr, "          %s\n", *i);
+                       }
                }
 
                delete app_;
@@ -90,6 +99,15 @@ void Application::set_startup_info(const char *argv0, void *data)
 
        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);