From f7d12ecaa69d55d0bbf30a9768ad35fe48dd700b Mon Sep 17 00:00:00 2001
From: Mike <mike.ph4@gmail.com>
Date: Sun, 15 Dec 2024 14:20:26 -0800
Subject: [PATCH] Clean up and fix broken pipe error

---
 src/backend/BluetoothTnc.scala | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/backend/BluetoothTnc.scala b/src/backend/BluetoothTnc.scala
index 658248a..6e9889e 100644
--- a/src/backend/BluetoothTnc.scala
+++ b/src/backend/BluetoothTnc.scala
@@ -70,6 +70,20 @@ class BluetoothTnc(service : AprsService, prefs : PrefsWrapper) extends AprsBack
 		var socket : BluetoothSocket = null
 		var proto : TncProto = null
 
+		def returnFreq() {
+			try {
+				val backendName = service.prefs.getBackendName()
+				// Check if the conditions for frequency control are met
+				if (service.prefs != null && backendName != null &&
+					service.prefs.getBoolean("freq_control", false) && backendName.contains("Bluetooth SPP")) {					
+					proto.writeReturn() // Send return command
+					}
+			} catch {
+				case e: Exception =>
+					Log.e(TAG, "Error while sending return frequency command.", e)
+			}
+		}			
+
 		def log(s : String) {
 			service.postAddPost(StorageDatabase.Post.TYPE_INFO, R.string.post_info, s)
 		}
@@ -176,11 +190,7 @@ class BluetoothTnc(service : AprsService, prefs : PrefsWrapper) extends AprsBack
 		def shutdown() {
 			Log.d(TAG, "shutdown()")
 			if (proto != null) {
-				val backendName = service.prefs.getBackendName()
-				if (service.prefs != null && backendName != null &&
-					service.prefs.getBoolean("freq_control", false) && backendName.contains("Bluetooth SPP")) {
-					proto.writeReturn()
-				}
+				returnFreq()
 				proto.stop()
 			}
 			this.synchronized {