From 2e36155e4111832636320f1a1f702cfec4dfe00b Mon Sep 17 00:00:00 2001
From: "F. Duncanh" <fduncanh@gmail.com>
Date: Thu, 12 Jan 2023 00:24:49 -0500
Subject: [PATCH] uxplay.cpp: cleaner shutdown

---
 uxplay.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/uxplay.cpp b/uxplay.cpp
index 3ac6595..f3d35de 100644
--- a/uxplay.cpp
+++ b/uxplay.cpp
@@ -1290,15 +1290,16 @@ int main (int argc, char *argv[]) {
 
     restart:
     if (start_dnssd(server_hw_addr, server_name)) {
-        return 1;
+        goto cleanup;
     }
     if (start_raop_server(display, tcp, udp, debug_log)) {
-        return 1;
+        stop_dnssd();
+        goto cleanup;
     }
     if (register_dnssd()) {
         stop_raop_server();
         stop_dnssd();
-        return  1;
+        goto cleanup;
     }
     reconnect:
     compression_type = 0;
@@ -1331,8 +1332,9 @@ int main (int argc, char *argv[]) {
     } else {
         LOGI("Stopping...");
         stop_raop_server();
-	stop_dnssd();
+        stop_dnssd();
     }
+    cleanup:
     if (use_audio) {
         audio_renderer_destroy();
     }