X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fcore%2Fapplication.cpp;h=5acae82242b0a6d4106c7d647460934fd6acae12;hb=516755dde30a4820495580d1b52a5b992f800461;hp=3a663dbb63b77fa85b4cf8ac9546d7543d6d7f98;hpb=55a79fbe96a87183fa4e11049eb161943636b1dd;p=libs%2Fcore.git

diff --git a/source/core/application.cpp b/source/core/application.cpp
index 3a663db..5acae82 100644
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -11,7 +11,7 @@ Distributed under the LGPL
 #include "../time/units.h"
 #include "../time/utils.h"
 #include "application.h"
-#include "error.h"
+#include "except.h"
 
 using namespace std;
 
@@ -24,7 +24,7 @@ application throws a UsageError, the static usage() function is called.
 This function can only be called once.  The global main() function provided by
 the library normally does it automatically at program startup.
 */
-int Application::run(int argc, char **argv)
+int Application::run(int argc, char **argv, void *data)
 {
 	static bool called=false;
 	if(called)
@@ -40,6 +40,8 @@ int Application::run(int argc, char **argv)
 		return 126;
 	}
 
+	data_=data;
+
 	try
 	{
 		try
@@ -133,6 +135,8 @@ int Application::main()
 			sched_yield();
 #endif
 		}
+		else if(loop_mode_==TICK_BUSY)
+			tick();
 	}
 
 	return exit_code;
@@ -199,5 +203,6 @@ Application::RegBase::RegBase()
 
 Application *Application::app_=0;
 Application::RegBase *Application::reg_app_=0;
+void *Application::data_=0;
 
 } // namespace Msp