Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4259 from minggo/async-loading-fix 

[ci skip]fix asynchronize loading bug
This commit is contained in:
minggo 2013-11-14 02:40:44 -08:00
parent f06d71dd49 2f7f05d1d7
commit 9b746d22f5
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cocos/2d/platform/android/CCFileUtilsAndroid.cpp
View File

@ -153,16 +153,6 @@ unsigned char* FileUtilsAndroid::doGetFileData(const char* filename, const char*
if (fullPath[0] != '/') if (fullPath[0] != '/')
{ {
// fullPathForFilename is not thread safe.
if (forAsync) {
LOGD("Async loading not supported. fullPathForFilename is not thread safe.");
return NULL;
}
string fullPath = fullPathForFilename(filename);
LOGD("full path = %s", fullPath.c_str());
string relativePath = string(); string relativePath = string();
size_t position = fullPath.find("assets/"); size_t position = fullPath.find("assets/");