From 1928117cee718bcdcd3bc1408940c8747f4c840e Mon Sep 17 00:00:00 2001
From: Przemyslaw Tredak <ptredak@nvidia.com>
Date: Tue, 21 Jul 2020 23:35:15 -0700
Subject: [PATCH] Fix crash when accessing already destructed static variables
 (#18768)

---
 src/c_api/c_api.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/c_api/c_api.cc b/src/c_api/c_api.cc
index ea39d9ac6e5b..53ff1e41c7f6 100644
--- a/src/c_api/c_api.cc
+++ b/src/c_api/c_api.cc
@@ -1316,6 +1316,7 @@ int MXNotifyShutdown() {
   API_BEGIN();
   mxnet::op::custom::CustomOperator::Get()->Stop();
   Engine::Get()->NotifyShutdown();
+  Engine::Get()->WaitForAll();
   API_END();
 }