Use NativeWindow::clone_from_ptr() to avoid Segfault

Since f24606cc84 in android-ndk-rs then NativeWindow now implements Clone and Drop which was technically a breaking change since it changed the ownership contract for existing users of NativeWindow::from_ptr(). We now use NativeWindow::clone_from_ptr() to account for the fact that the window will be unconditionally _released() when NativeWindow gets dropped. This addresses a crash I was debugging with the Cpal and Oboe examples which turned out to be nothing to do with the examples themselves.
rib · Aug 12, 2022 · 93828a1 · 93828a1
1 parent 4818de6
commit 93828a1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/android-activity/src/game_activity/mod.rs b/android-activity/src/game_activity/mod.rs
@@ -269,8 +269,11 @@ impl AndroidAppInner {
                                     }
                                     MainEvent::InitWindow { .. } => {
                                         let win_ptr = (*app_ptr.as_ptr()).window;
+                                        // It's important that we use ::clone_from_ptr() here
+                                        // because NativeWindow has a Drop implementation that
+                                        // will unconditionally _release() the native window
                                         *self.native_window.write().unwrap() = Some(
-                                            NativeWindow::from_ptr(NonNull::new(win_ptr).unwrap()),
+                                            NativeWindow::clone_from_ptr(NonNull::new(win_ptr).unwrap()),
                                         );
                                     }
                                     MainEvent::TerminateWindow { .. } => {

diff --git a/android-activity/src/native_activity/mod.rs b/android-activity/src/native_activity/mod.rs
@@ -271,8 +271,11 @@ impl AndroidAppInner {
                                         }
                                         MainEvent::InitWindow { .. } => {
                                             let win_ptr = (*app_ptr.as_ptr()).window;
+                                            // It's important that we use ::clone_from_ptr() here
+                                            // because NativeWindow has a Drop implementation that
+                                            // will unconditionally _release() the native window
                                             *self.native_window.write().unwrap() =
-                                                Some(NativeWindow::from_ptr(
+                                                Some(NativeWindow::clone_from_ptr(
                                                     NonNull::new(win_ptr).unwrap(),
                                                 ));
                                         }