ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use standard data dir location if possible

Browse Source
This commit is contained in:
Deve 2018-08-23 07:14:53 +02:00
parent 8363dd42d3
commit 7e7a23854f
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/utils/separate_process.cpp
View File

@ -283,22 +283,23 @@ bool SeparateProcess::createChildProcess(const std::string& exe,
return false;
}
CIrrDeviceAndroid* device = dynamic_cast<CIrrDeviceAndroid*>(
irr_driver->getDevice());
AndroidApplicationInfo application_info = device->getApplicationInfo();
std::string data_path = application_info.data_dir;
std::string data_path = "/data/data/" ANDROID_PACKAGE_NAME;
std::string main_path = data_path + "/lib/libmain.so";
if (data_path.empty() || access(main_path.c_str(), R_OK) != 0)
if (access(main_path.c_str(), R_OK) != 0)
{
Log::warn("SeparateProcess", "Cannot read data dir from app info");
data_path = "/data/data/" ANDROID_PACKAGE_NAME;
Log::warn("SeparateProcess", "Cannot use standard data dir");
CIrrDeviceAndroid* device = dynamic_cast<CIrrDeviceAndroid*>(
irr_driver->getDevice());
AndroidApplicationInfo application_info = device->getApplicationInfo();
data_path = application_info.data_dir;
main_path = data_path + "/lib/libmain.so";
}
if (access(main_path.c_str(), R_OK) != 0)
if (data_path.empty() || access(main_path.c_str(), R_OK) != 0)
{
Log::error("SeparateProcess", "Error: Cannot read libmain.so");
return false;