Chdir into a sensible location before starting the application

[libs/core.git] / source / core / android / mainthread.cpp

diff --git a/source/core/android/mainthread.cpp b/source/core/android/mainthread.cpp
index e07c837bcfdb15706f33e62baa98eeb1b82b26db..473379bd71ce373c4e8e8829d4a00ece43ff3c57 100644 (file)
--- a/source/core/android/mainthread.cpp
+++ b/source/core/android/mainthread.cpp
@@ -1,5 +1,7 @@
 #include <cstring>
+#include <msp/fs/dir.h>
 #include <msp/fs/path.h>
+#include <msp/fs/utils.h>
 #include "application.h"
 #include "errorlogger.h"
 #include "mainthread.h"
@@ -10,19 +12,25 @@ namespace Msp {
 namespace Android {
 
 MainThread::MainThread(ANativeActivity *a):
-       activity(a),
+       asset_manager(a->assetManager),
+       int_data_path(a->internalDataPath),
        starting_up(true)
 {
+       attach_to_activity(a);
+       startup_mutex.lock();
+       launch();
+}
+
+void MainThread::attach_to_activity(ANativeActivity *a)
+{
+       activity = a;
+       activity->callbacks->onDestroy = &activity_destroyed;
        activity->callbacks->onNativeWindowCreated = &native_window_created;
        activity->callbacks->onNativeWindowResized = &native_window_resized;
        activity->callbacks->onNativeWindowDestroyed = &native_window_destroyed;
        activity->callbacks->onInputQueueCreated = &input_queue_created;
        activity->callbacks->onInputQueueDestroyed = &input_queue_destroyed;
        activity->instance = this;
-
-       startup_mutex.lock();
-
-       launch();
 }
 
 void MainThread::wait_for_app_created()
@@ -43,12 +51,14 @@ void MainThread::main()
 {
        /* I have no idea how dependable this is, but it seems to be the only way
        to get the package name aside from making a Java call through JNI */
-       char *appname = strdup(FS::Path(activity->internalDataPath)[-2].c_str());
+       char *appname = strdup(int_data_path[-2].c_str());
        char *argv[] = { appname, 0 };
        Msp::Android::ErrorLogger err_logger;
+       FS::chdir(FS::dirname(int_data_path));
        Msp::Application::run(1, argv, this, &app_created);
        free(appname);
-       ANativeActivity_finish(activity);
+       if(activity)
+               ANativeActivity_finish(activity);
 }
 
 void MainThread::app_created(void *data)
@@ -56,6 +66,11 @@ void MainThread::app_created(void *data)
        reinterpret_cast<MainThread *>(data)->resume_startup();
 }
 
+void MainThread::activity_destroyed(ANativeActivity *activity)
+{
+       reinterpret_cast<MainThread *>(activity->instance)->activity = 0;
+}
+
 void MainThread::native_window_created(ANativeActivity *activity, ANativeWindow *window)
 {
        reinterpret_cast<MainThread *>(activity->instance)->signal_native_window_created.emit(window);