[Scummvm-cvs-logs] scummvm master -> b577da29b569a9ea4d74f4b8ea0d7e4fa3cae587

[clone2727]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b577da29b5 ANDROID: Delay deleting a local ref until it's no longer used


Commit: b577da29b569a9ea4d74f4b8ea0d7e4fa3cae587
    https://github.com/scummvm/scummvm/commit/b577da29b569a9ea4d74f4b8ea0d7e4fa3cae587
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2014-11-15T09:21:36-05:00

Commit Message:
ANDROID: Delay deleting a local ref until it's no longer used

Should fix bug #6741

Changed paths:
    backends/platform/android/asset-archive.cpp



diff --git a/backends/platform/android/asset-archive.cpp b/backends/platform/android/asset-archive.cpp
index 52c2c08..6680081 100644
--- a/backends/platform/android/asset-archive.cpp
+++ b/backends/platform/android/asset-archive.cpp
@@ -295,7 +295,6 @@ AssetFdReadStream::AssetFdReadStream(JNIEnv *env, jobject assetfd) :
 	jclass cls = env->GetObjectClass(_assetfd);
 	MID_close = env->GetMethodID(cls, "close", "()V");
 	assert(MID_close);
-	env->DeleteLocalRef(cls);
 
 	jmethodID MID_getStartOffset =
 		env->GetMethodID(cls, "getStartOffset", "()J");
@@ -321,6 +320,8 @@ AssetFdReadStream::AssetFdReadStream(JNIEnv *env, jobject assetfd) :
 
 	_fd = env->GetIntField(javafd, FID_descriptor);
 	env->DeleteLocalRef(javafd);
+
+	env->DeleteLocalRef(cls);
 }
 
 AssetFdReadStream::~AssetFdReadStream() {