fix protected values destruction on shutdown

realm · Mar 10, 2021 · 9b23c55 · 9b23c55
1 parent 8960b53
commit 9b23c55
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/realm-dart-extension/dart/dart_protected.hpp b/src/realm-dart-extension/dart/dart_protected.hpp
@@ -61,7 +61,11 @@ class Protected {
 		}
 
 		try {
-			Dart_DeletePersistentHandle(m_ref);
+			Dart_Isolate isolate = Dart_CurrentIsolate();
+			//make sure there is current isolate. On Dart VM shutdown there might be no current isolate so just drop the handles
+			if (isolate != nullptr) {
+				Dart_DeletePersistentHandle(m_ref);
+			}
 			m_ref = nullptr;
 		}
 		catch (...) {}