X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fandroid%2Fmain.cpp;h=ff811c19dd4172ba51c98953b76f1976bb3cc8ac;hb=HEAD;hp=86ed5bed84572e0029b0f2cf35fe668bac866586;hpb=211c503e709ffa8bec7b71b8004ecdeadf776c4c;p=libs%2Fcore.git

diff --git a/source/core/android/main.cpp b/source/core/android/main.cpp
index 86ed5be..d6ad415 100644
--- a/source/core/android/main.cpp
+++ b/source/core/android/main.cpp
@@ -1,6 +1,12 @@
 #include "mainthread.h"
+#include "mspcore_api.h"
 
-extern "C" void ANativeActivity_onCreate(ANativeActivity *activity, void * /*saved_state*/, size_t /*state_size*/)
+extern "C" MSPCORE_API void ANativeActivity_onCreate(ANativeActivity *activity, void * /*saved_state*/, size_t /*state_size*/)
 {
-	new Msp::Android::MainThread(activity);
+	static Msp::Android::MainThread *thread = nullptr;
+	if(thread)
+		thread->attach_to_activity(activity);
+	else
+		thread = new Msp::Android::MainThread(activity);
+	thread->wait_for_app_created();
 }