plastichub/nodeguy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make the wrapper cache callback work

Browse Source
This commit is contained in:
Simon Edwards 2021-10-27 12:20:49 +02:00
parent 710cfa3d31
commit 123123605c
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/cpp/lib/core/WrapperCache/wrappercache.cpp
View File

@ -56,15 +56,16 @@ void WrapperCache::handleDestroyed(const QObject* object) {
return;
}
uint32_t result = 0;
Napi::Env env = this->cache[object].env;
napi_reference_unref(env, this->cache[object].ref, &result);
this->cache.remove(object);
// Callback to JS with the address/ID of the destroyed object. So that it
// can clear it out of the cache.
if (destroyedCallback) {
Napi::Env env = destroyedCallback.Env();
Napi::HandleScope scope(env);
destroyedCallback.Call(
{Napi::Value::From(env, extrautils::hashPointerTo53bit(object))});
}
uint32_t result = 0;
napi_reference_unref(this->cache[object].env, this->cache[object].ref, &result);
this->cache.remove(object);
}

4
src/lib/core/WrapperCache.ts
View File

@ -19,7 +19,6 @@ export class WrapperCache {
}
private _objectDestroyedCallback(objectId: number): void {
console.log(`_objectDestroyedCallback() id: ${objectId}`);
if (!this._cache.has(objectId)) {
return;
}
@ -30,9 +29,6 @@ export class WrapperCache {
get<T>(wrapperConstructor: { new (native: any): T }, native: any): T {
const id = native.__id__();
console.log(`WrapperCache.get() id: ${id}`);
if (this._cache.has(id)) {
return this._cache.get(id) as T;
}