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

diff --git a/source/core/application.cpp b/source/core/application.cpp
index 3a663db..cc9946c 100644
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -4,14 +4,16 @@ This file is part of libmspcore
 Copyright © 2006 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
+
 #include <signal.h>
 #include <iostream>
+#include <typeinfo>
 #include "../debug/backtrace.h"
 #include "../debug/demangle.h"
 #include "../time/units.h"
 #include "../time/utils.h"
 #include "application.h"
-#include "error.h"
+#include "except.h"
 
 using namespace std;
 
@@ -24,7 +26,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 +42,8 @@ int Application::run(int argc, char **argv)
 		return 126;
 	}
 
+	data_=data;
+
 	try
 	{
 		try
@@ -58,6 +62,12 @@ int Application::run(int argc, char **argv)
 	}
 	catch(const exception &e)
 	{
+		delete app_;
+
+#ifdef WIN32
+		string msg=Debug::demangle(typeid(e).name())+":\n"+e.what();
+		MessageBox(0, msg.c_str(), "Uncaught exception", MB_OK|MB_ICONERROR);
+#else
 		cerr<<"An uncaught exception occurred.\n";
 		cerr<<"  type:   "<<Debug::demangle(typeid(e).name())<<'\n';
 		cerr<<"  what(): "<<e.what()<<'\n';
@@ -75,8 +85,8 @@ int Application::run(int argc, char **argv)
 				cerr<<" from "<<i->file<<'\n';
 			}
 		}
+#endif
 
-		delete app_;
 		return 124;
 	}
 }
@@ -133,6 +143,8 @@ int Application::main()
 			sched_yield();
 #endif
 		}
+		else if(loop_mode_==TICK_BUSY)
+			tick();
 	}
 
 	return exit_code;
@@ -199,5 +211,6 @@ Application::RegBase::RegBase()
 
 Application *Application::app_=0;
 Application::RegBase *Application::reg_app_=0;
+void *Application::data_=0;
 
 } // namespace Msp