Merge pull request IntelRealSense#2151 from tingshao/reset_error

[Node.js] Reset internal error among each native call
ForS1F · Jul 27, 2018 · 4a2dc91 · 4a2dc91
2 parents 13afbea + 3dac6a5
commit 4a2dc91
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/wrappers/nodejs/src/addon.cpp b/wrappers/nodejs/src/addon.cpp
@@ -185,6 +185,8 @@ ErrorUtil* ErrorUtil::singleton_ = nullptr;
 
 template<typename R, typename F, typename... arguments>
 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<typename F, typename... arguments>
 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);