fix loading

cunarist · Sep 9, 2024 · 6aa77e8 · 6aa77e8
1 parent 2b0b9ff
commit 6aa77e8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/flutter_ffi_plugin/lib/src/interface_os.dart b/flutter_ffi_plugin/lib/src/interface_os.dart
@@ -15,6 +15,9 @@ void setCompiledLibPathReal(String path) {
 Future<void> prepareInterfaceReal(
   AssignRustSignal assignRustSignal,
 ) async {
+  // Load the native library.
+  loadRustLibrary();
+
   /// This should be called once at startup
   /// to enable `allo_isolate` to send data from the Rust side.
   storeDartPostCObjectReal(NativeApi.postCObject);

diff --git a/flutter_ffi_plugin/lib/src/load_os.dart b/flutter_ffi_plugin/lib/src/load_os.dart
@@ -2,30 +2,29 @@ import 'dart:io' as io;
 import 'dart:ffi';
 
 String? dynamicLibPath;
-final rustLibrary = loadRustLibrary();
 
 void setDynamicLibPath(String path) {
   dynamicLibPath = path;
 }
 
-DynamicLibrary loadRustLibrary() {
+void loadRustLibrary() {
   // Use provided dynamic library path if possible.
   final path = dynamicLibPath;
   if (path != null) {
-    return DynamicLibrary.open(path);
+    DynamicLibrary.open(path);
   }
 
   // Otherewise, use the default path.
   if (io.Platform.isLinux) {
-    return DynamicLibrary.open('libhub.so');
+    DynamicLibrary.open('libhub.so');
   } else if (io.Platform.isAndroid) {
-    return DynamicLibrary.open('libhub.so');
+    DynamicLibrary.open('libhub.so');
   } else if (io.Platform.isWindows) {
-    return DynamicLibrary.open('hub.dll');
+    DynamicLibrary.open('hub.dll');
   } else if (io.Platform.isIOS) {
-    return DynamicLibrary.open('rinf.framework/rinf');
+    DynamicLibrary.open('rinf.framework/rinf');
   } else if (io.Platform.isMacOS) {
-    return DynamicLibrary.open('rinf.framework/rinf');
+    DynamicLibrary.open('rinf.framework/rinf');
   } else {
     throw UnsupportedError('This operating system is not supported.');
   }