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 7219cdf2fdd9ef1476072f90aac28a1364beb776..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"
@@ -49,9 +51,10 @@ 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);
        if(activity)