From baf692cf3de52cb1f2fa0b29faa03c608d20fee7 Mon Sep 17 00:00:00 2001
From: Przemek Tredak <ptredak@nvidia.com>
Date: Tue, 21 Jul 2020 16:43:11 -0700
Subject: [PATCH] Fix crash when accessing already destructed static variables

---
 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();
 }