From 982fc7184d46621948e53b485c7504c9d11f3350 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 17 May 2024 17:00:59 +0200 Subject: Merging upstream version 4.2.5. Signed-off-by: Daniel Baumann --- ui/qt/rtp_player_dialog.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'ui/qt/rtp_player_dialog.cpp') diff --git a/ui/qt/rtp_player_dialog.cpp b/ui/qt/rtp_player_dialog.cpp index 7d0ad62d..60418cc8 100644 --- a/ui/qt/rtp_player_dialog.cpp +++ b/ui/qt/rtp_player_dialog.cpp @@ -393,13 +393,13 @@ RtpPlayerDialog::~RtpPlayerDialog() { std::lock_guard lock(init_mutex_); if (pinstance_ != nullptr) { - cleanupMarkerStream(); for (int row = 0; row < ui->streamTreeWidget->topLevelItemCount(); row++) { QTreeWidgetItem *ti = ui->streamTreeWidget->topLevelItem(row); RtpAudioStream *audio_stream = ti->data(stream_data_col_, Qt::UserRole).value(); if (audio_stream) delete audio_stream; } + cleanupMarkerStream(); delete ui; pinstance_ = nullptr; } @@ -1288,7 +1288,9 @@ void RtpPlayerDialog::playFinished(RtpAudioStream *stream, QAudio::Error error) } playing_streams_.removeOne(stream); if (playing_streams_.isEmpty()) { - marker_stream_->stop(); + if (marker_stream_) { + marker_stream_->stop(); + } updateWidgets(); } } -- cgit v1.2.3