github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Check for null when converting Wrappable

Browse Source
This commit is contained in:
Cheng Zhao
2015-06-24 16:35:37 +08:00
parent cad1fa50a9
commit cc4e2fcd94
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
native_mate/wrappable.h
View File

@@ -89,7 +89,10 @@ template<typename T>
struct Converter<T*, typename enable_if<
is_convertible<T*, Wrappable*>::value>::type> {
static v8::Local<v8::Value> ToV8(v8::Isolate* isolate, T* val) {
return val->GetWrapper(isolate);
if (val)
return val->GetWrapper(isolate);
else
return v8::Null(isolate);
}
static bool FromV8(v8::Isolate* isolate, v8::Local<v8::Value> val, T** out) {