Allow startup info to be set externally

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

diff --git a/source/core/application.cpp b/source/core/application.cpp
index f4887e756ff2ca64811b37bb7093c06157ff59b8..0ef9507a14275af33fadbd1a73f190528e8f1601 100644 (file)
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -37,8 +37,7 @@ int Application::run(int argc, char **argv, void *data, void (*created_callback)
                return 126;
        }
 
                return 126;
        }
 

-       argv0_ = argv[0];
-       data_ = data;
+       set_startup_info(argv[0], data);

 
        try
        {
 
        try
        {


@@ -81,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;
 int Application::main()
 {
        done = false;