set native state

software-mansion · May 17, 2024 · bbcb11f · bbcb11f
1 parent adec927
commit bbcb11f
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/Common/cpp/SharedItems/Shareables.cpp b/Common/cpp/SharedItems/Shareables.cpp
@@ -237,7 +237,16 @@ jsi::Value ShareableObject::toJSValue(jsi::Runtime &rt) {
         rt, data_[i].first.c_str(), data_[i].second->getJSValue(rt));
   }
   if (nativeState_ != nullptr) {
-    obj.setNativeState(rt, nativeState_);
+    if (nativeStateAccess_ == NativeStateAccess::Safe) {
+      obj.setNativeState(rt, nativeState_);
+    } else if (nativeStateAccess_ == NativeStateAccess::Unknown) {
+      try {
+        obj.setNativeState(rt, nativeState_);
+        nativeStateAccess_ = NativeStateAccess::Safe;
+      } catch (...) {
+        nativeStateAccess_ = NativeStateAccess::Unsafe;
+      }
+    }
   }
   return obj;
 }