Merge branch 'release'

plamen5kov · plamen5kov · commit 40af180a9a53 · 2017-01-13T09:55:17.000+02:00
diff --git a/runtime/src/main/jni/JsV8InspectorClient.cpp b/runtime/src/main/jni/JsV8InspectorClient.cpp
@@ -23,7 +23,8 @@ JsV8InspectorClient::JsV8InspectorClient(v8::Isolate *isolate)
           inspector_(nullptr),
           session_(nullptr),
           connection(nullptr),
-          context_()
+          context_(),
+          running_nested_loop_(false)
 {
     JEnv env;
 
@@ -223,7 +224,7 @@ JsV8InspectorClient *JsV8InspectorClient::GetInstance()
 
 void JsV8InspectorClient::sendToFrontEndCallback(const v8::FunctionCallbackInfo<v8::Value>& args) {
 
-    if(instance->connection == nullptr) {
+    if ((instance == nullptr) || (instance->connection == nullptr)) {
         return;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@ JsV8InspectorClient::JsV8InspectorClient(v8::Isolate *isolate)`
`23`	`23`	`inspector_(nullptr),`
`24`	`24`	`session_(nullptr),`
`25`	`25`	`connection(nullptr),`
`26`		`- context_()`
	`26`	`+ context_(),`
	`27`	`+ running_nested_loop_(false)`
`27`	`28`	`{`
`28`	`29`	`JEnv env;`
`29`	`30`
`@@ -223,7 +224,7 @@ JsV8InspectorClient *JsV8InspectorClient::GetInstance()`
`223`	`224`
`224`	`225`	`void JsV8InspectorClient::sendToFrontEndCallback(const v8::FunctionCallbackInfo<v8::Value>& args) {`
`225`	`226`
`226`		`- if(instance->connection == nullptr) {`
	`227`	`+ if ((instance == nullptr) \|\| (instance->connection == nullptr)) {`
`227`	`228`	`return;`
`228`	`229`	`}`
`229`	`230`