diff options
| author | Mike Morris <mikemorris@users.noreply.github.com> | 2016-04-07 17:05:13 -0400 |
|---|---|---|
| committer | Mike Morris <mikemorris@users.noreply.github.com> | 2016-04-07 17:35:58 -0400 |
| commit | c59b5fb5e6bf7c8b5d0b1edaa9db791262ee9e43 (patch) | |
| tree | 6d7a560d2411d0579fb6cdfe86cf097759d78c78 | |
| parent | 89db01fef0abe258e152eeb2013358c74f8bfeec (diff) | |
| download | qtlocation-mapboxgl-c59b5fb5e6bf7c8b5d0b1edaa9db791262ee9e43.tar.gz | |
[node] don't dispose parent module in NodeLog destructor
| -rw-r--r-- | platform/node/src/node_log.cpp | 1 | ||||
| -rw-r--r-- | platform/node/src/node_mapbox_gl_native.cpp | 2 | ||||
| -rw-r--r-- | platform/node/test/js/require.js | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/platform/node/src/node_log.cpp b/platform/node/src/node_log.cpp index 8230bb36ce..a741109b27 100644 --- a/platform/node/src/node_log.cpp +++ b/platform/node/src/node_log.cpp @@ -52,7 +52,6 @@ NodeLogObserver::NodeLogObserver(v8::Local<v8::Object> target) NodeLogObserver::~NodeLogObserver() { queue->stop(); - module.Reset(); } bool NodeLogObserver::onRecord(mbgl::EventSeverity severity, mbgl::Event event, int64_t code, const std::string &text) { diff --git a/platform/node/src/node_mapbox_gl_native.cpp b/platform/node/src/node_mapbox_gl_native.cpp index 2a9e9fb6c3..28df6af01c 100644 --- a/platform/node/src/node_mapbox_gl_native.cpp +++ b/platform/node/src/node_mapbox_gl_native.cpp @@ -77,7 +77,7 @@ void RegisterModule(v8::Local<v8::Object> target, v8::Local<v8::Object> module) Nan::Get(EventEmitter, Nan::New("prototype").ToLocalChecked()).ToLocalChecked()); Nan::CallAsFunction(EventEmitter, target, 0, nullptr); - mbgl::Log::setObserver(std::make_unique<node_mbgl::NodeLogObserver>(target->ToObject())); + mbgl::Log::setObserver(std::make_unique<node_mbgl::NodeLogObserver>(target)); } NODE_MODULE(mapbox_gl_native, RegisterModule) diff --git a/platform/node/test/js/require.js b/platform/node/test/js/require.js new file mode 100644 index 0000000000..1528002c20 --- /dev/null +++ b/platform/node/test/js/require.js @@ -0,0 +1 @@ +var mbgl = require('../../../../lib/mapbox-gl-native'); |