X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fapplication.cpp;h=3a5561eb5f6d6db8b62b488ab3c7c81132384812;hb=c0d3fd58fd25e4627a6f8d64a22c5800e783ce07;hp=43bb023143679e7fdf5e64d893208f859222d973;hpb=f042fd992170ee8a50a7f596f1c9cdd9600b8583;p=libs%2Fcore.git

diff --git a/source/core/application.cpp b/source/core/application.cpp
index 43bb023..3a5561e 100644
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -16,21 +16,16 @@ void *Application::data_ = 0;
 
 Application::Application():
 	exit_code(0)
-{ }
-
-int Application::run(int argc, char **argv, void *data)
 {
-	static bool called = false;
-	if(called)
-	{
-		IO::cerr.write("Trying to call Application::run_app twice!\n");
-		return 125;
-	}
-	called = true;
+	if(app_)
+		throw logic_error("instance already exists");
+}
 
+int Application::run(int argc, char **argv, void *data, void (*created_callback)(void *))
+{
 	if(!starter_)
 	{
-		IO::cerr.write("Trying to run with no RegisteredApplication class!\n");
+		IO::cerr.write("Application::run called with no RegisteredApplication class!\n");
 		return 126;
 	}
 
@@ -48,6 +43,9 @@ int Application::run(int argc, char **argv, void *data)
 			return 1;
 		}
 
+		if(created_callback)
+			created_callback(data);
+
 		int result = app_->main();
 		Application *a = app_;
 		app_ = 0;
@@ -68,6 +66,7 @@ int Application::run(int argc, char **argv, void *data)
 		}
 
 		delete app_;
+		app_ = 0;
 
 		return 124;
 	}