From a089697d9e1e37d83b834a110c585fed06d8538b Mon Sep 17 00:00:00 2001
From: Kevin Eady <8634912+KevinEady@users.noreply.github.com>
Date: Fri, 23 Apr 2021 10:01:32 +0200
Subject: [PATCH] Address review comments - Move define to src - Correct fix
 implementation

---
 common.gypi   | 1 -
 napi-inl.h    | 5 -----
 test/error.cc | 1 +
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/common.gypi b/common.gypi
index 4955dc9bc..9be254f0b 100644
--- a/common.gypi
+++ b/common.gypi
@@ -15,7 +15,6 @@
       }
     }]
   ],
-  'defines': [ 'NODE_API_SWALLOW_UNTHROWABLE_EXCEPTIONS' ],
   'include_dirs': ["<!(node -p \"require('../').include_dir\")"],
   'cflags': [ '-Werror', '-Wall', '-Wextra', '-Wpedantic', '-Wunused-parameter' ],
   'cflags_cc': [ '-Werror', '-Wall', '-Wextra', '-Wpedantic', '-Wunused-parameter' ]
diff --git a/napi-inl.h b/napi-inl.h
index 75c0bc574..304cad46f 100644
--- a/napi-inl.h
+++ b/napi-inl.h
@@ -2418,11 +2418,6 @@ inline void Error::ThrowAsJavaScriptException() const {
     napi_status status = napi_throw(_env, Value());
 #endif
 
-    if (status == napi_pending_exception) {
-      // The environment could be terminating.
-      return;
-    }
-
 #ifdef NAPI_CPP_EXCEPTIONS
     if (status != napi_ok) {
       throw Error::New(_env);
diff --git a/test/error.cc b/test/error.cc
index 15858182e..e41a389ba 100644
--- a/test/error.cc
+++ b/test/error.cc
@@ -1,3 +1,4 @@
+#define NODE_API_SWALLOW_UNTHROWABLE_EXCEPTIONS
 #include <future>
 #include "napi.h"