From f4c928f26e5277f7a15b4adeaa2765296184d3f4 Mon Sep 17 00:00:00 2001 From: Cory McWilliams Date: Tue, 2 Sep 2025 20:57:05 -0400 Subject: [PATCH] android: Of course you can't put null in a LinkedBlockingQueue. Shrug. Fixes a shutdown crash. --- .../com/unprompted/tildefriends/TildeFriendsActivity.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/android/com/unprompted/tildefriends/TildeFriendsActivity.java b/src/android/com/unprompted/tildefriends/TildeFriendsActivity.java index d70e359d..ad1e89db 100644 --- a/src/android/com/unprompted/tildefriends/TildeFriendsActivity.java +++ b/src/android/com/unprompted/tildefriends/TildeFriendsActivity.java @@ -63,6 +63,7 @@ public class TildeFriendsActivity extends Activity { private float touch_down_y; private boolean ready = false; private boolean loaded = false; + private boolean shutting_down = false; static { log("Calling system.loadLibrary()."); @@ -274,7 +275,7 @@ public class TildeFriendsActivity extends Activity { log_thread = new Thread(new Runnable() { @Override public void run() { - while (true) { + while (!s_activity.shutting_down) { try { String message = log_queue.take(); if (message != null) { @@ -335,8 +336,9 @@ public class TildeFriendsActivity extends Activity { protected void onDestroy() { try { + shutting_down = true; if (log_queue != null) { - log_queue.put(null); + log_queue.put("Goodbye."); } log_thread.join(); } catch (InterruptedException e) {