kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:sergey-miryanov/lime

Browse Source
This commit is contained in:
zerg
2013-12-09 15:48:55 +06:00
parent e6802e8bb2 27536ce74c
commit f844186c02
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
project/src/platform/android/JNI.cpp
View File

@@ -600,6 +600,12 @@ bool HaxeToJNI(JNIEnv *inEnv, value inValue, JNIType inType, jvalue &out)
jobject obj = 0; jobject obj = 0;
if (!AbstractToJObject(inValue,obj)) if (!AbstractToJObject(inValue,obj))
{ {
if (val_is_string(inValue))
{
out.l = inEnv->NewStringUTF(val_string(inValue));
return true;
}
ELOG("HaxeToJNI : jniObject not an object %p", inValue); ELOG("HaxeToJNI : jniObject not an object %p", inValue);
return false; return false;
} }
@@ -1113,7 +1119,7 @@ struct JNIMethod : public lime::Object
result = alloc_int(env->CallShortMethodA(inObject, mMethod, jargs)); result = alloc_int(env->CallShortMethodA(inObject, mMethod, jargs));
break; break;
case jniInt: case jniInt:
result = alloc_int(env->CallIntMethodA(mClass, mMethod, jargs)); result = alloc_int(env->CallIntMethodA(inObject, mMethod, jargs));
break; break;
case jniLong: case jniLong:
result = alloc_int(env->CallLongMethodA(inObject, mMethod, jargs)); result = alloc_int(env->CallLongMethodA(inObject, mMethod, jargs));