From 1d3ca83c3e4ba87f32bdf594ce09eb343a2ef075 Mon Sep 17 00:00:00 2001
From: Martin Pulec <martin.pulec@cesnet.cz>
Date: Thu, 8 Feb 2024 14:32:05 +0100
Subject: [PATCH] video_rxtx/h264_rtp.cpp: deleteStream msg not proc

Fixed deleteStream message not being processed if the client doesn't
properly issue TEARDOWN on `Medium::close(instance->rtspServer);`.

(see also previous 2 commits)
---
 src/video_rxtx.cpp          | 7 ++++---
 src/video_rxtx/h264_rtp.cpp | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/video_rxtx.cpp b/src/video_rxtx.cpp
index 2ed4010a8..3262a06e1 100644
--- a/src/video_rxtx.cpp
+++ b/src/video_rxtx.cpp
@@ -185,8 +185,9 @@ void *video_rxtx::sender_loop() {
                 shared_ptr<video_frame> tx_frame;
 
                 tx_frame = compress_pop(m_compression);
-                if (!tx_frame)
-                        goto exit;
+                if (!tx_frame) {
+                        break;
+                }
 
                 export_video(m_exporter, tx_frame.get());
 
@@ -194,7 +195,7 @@ void *video_rxtx::sender_loop() {
                 m_frames_sent += 1;
         }
 
-exit:
+        check_sender_messages();
         return NULL;
 }
 
diff --git a/src/video_rxtx/h264_rtp.cpp b/src/video_rxtx/h264_rtp.cpp
index 023296f0f..3bd003c94 100644
--- a/src/video_rxtx/h264_rtp.cpp
+++ b/src/video_rxtx/h264_rtp.cpp
@@ -110,8 +110,8 @@ h264_rtp_video_rxtx::~h264_rtp_video_rxtx()
 
 void h264_rtp_video_rxtx::join()
 {
-        video_rxtx::join();
         c_stop_server(m_rtsp_server);
+        video_rxtx::join();
 }
 
 static void rtps_server_usage(){