Merge pull request #780 from jeyum2/fix-android-panic

Bromeon · web-flow · commit 3e24714ab7d3 · 2024-07-19T16:21:48.000Z
Disable main_thread_id assertion for Android debug build
diff --git a/godot-ffi/src/binding/single_threaded.rs b/godot-ffi/src/binding/single_threaded.rs
@@ -149,7 +149,8 @@ impl BindingStorage {
 
         // We only check if we are in the main thread in debug builds if we aren't building for a non-threaded Godot build,
         // since we could otherwise assume there won't be multi-threading.
-        #[cfg(all(debug_assertions, not(wasm_nothreads)))]
+        // TODO: figure out why the panic happens on Android, and how to resolve it. See https://github.com/godot-rust/gdext/pull/780.
+        #[cfg(all(debug_assertions, not(wasm_nothreads), not(target_os = "android")))]
         {
             let main_thread_id = storage.main_thread_id.get().expect(
                 "Godot engine not available; make sure you are not calling it from unit/doc tests",

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,8 @@ impl BindingStorage {`
`149`	`149`
`150`	`150`	`// We only check if we are in the main thread in debug builds if we aren't building for a non-threaded Godot build,`
`151`	`151`	`// since we could otherwise assume there won't be multi-threading.`
`152`		`- #[cfg(all(debug_assertions, not(wasm_nothreads)))]`
	`152`	`+ // TODO: figure out why the panic happens on Android, and how to resolve it. See https://github.com/godot-rust/gdext/pull/780.`
	`153`	`+ #[cfg(all(debug_assertions, not(wasm_nothreads), not(target_os = "android")))]`
`153`	`154`	`{`
`154`	`155`	`let main_thread_id = storage.main_thread_id.get().expect(`
`155`	`156`	`"Godot engine not available; make sure you are not calling it from unit/doc tests",`