From 71355aaab7eca64bec694918c6b911a412ad17f0 Mon Sep 17 00:00:00 2001
From: Juan Linietsky
Date: Sat, 24 May 2014 13:25:56 -0300
Subject: -Fixed bug in "extends"

---
 platform/android/java_glue.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'platform/android/java_glue.cpp')

diff --git a/platform/android/java_glue.cpp b/platform/android/java_glue.cpp
index 5bf2fc5a7..4362b8f2c 100644
--- a/platform/android/java_glue.cpp
+++ b/platform/android/java_glue.cpp
@@ -354,6 +354,7 @@ public:
 	virtual Variant call(const StringName& p_method,const Variant** p_args,int p_argcount,Variant::CallError &r_error) {
 
 		//print_line("attempt to call "+String(p_method));
+		ERR_FAIL_COND_V(!instance,Variant());
 
 		r_error.error=Variant::CallError::CALL_OK;
 
@@ -519,7 +520,10 @@ public:
 	}
 
 
-	JNISingleton() {}
+	JNISingleton() {
+		instance=NULL;
+
+	}
 
 };
 
-- 
cgit v1.2.3-70-g09d2