From 3dac6a5df161cfa6ad65edd6bc890fb5aa2916b0 Mon Sep 17 00:00:00 2001 From: "Shao,Ting" Date: Thu, 26 Jul 2018 16:34:11 +0800 Subject: [PATCH] [Node.js] Reset internal error among each native call --- wrappers/nodejs/src/addon.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wrappers/nodejs/src/addon.cpp b/wrappers/nodejs/src/addon.cpp index daeb4c8a72..5ea08a06be 100644 --- a/wrappers/nodejs/src/addon.cpp +++ b/wrappers/nodejs/src/addon.cpp @@ -185,6 +185,8 @@ ErrorUtil* ErrorUtil::singleton_ = nullptr; template R GetNativeResult(F func, rs2_error** error, arguments... params) { + // reset the error pointer for each call. + *error = nullptr; ErrorUtil::ResetError(); R val = func(params...); ErrorUtil::AnalyzeError(*error); @@ -193,6 +195,8 @@ R GetNativeResult(F func, rs2_error** error, arguments... params) { template void CallNativeFunc(F func, rs2_error** error, arguments... params) { + // reset the error pointer for each call. + *error = nullptr; ErrorUtil::ResetError(); func(params...); ErrorUtil::AnalyzeError(*error);