From 4e74e0f755bf5e31791e699ebf89adfaa911a6ca Mon Sep 17 00:00:00 2001
From: Dean Lee <deanlee3@gmail.com>
Date: Tue, 9 Dec 2025 08:36:55 +0800
Subject: [PATCH] cabana: fix UI hang when switching streams (#36735)

fix UI hang when switching streams
---
 tools/cabana/mainwin.cc | 10 +++++++++-
 tools/cabana/mainwin.h  |  1 +
 tools/replay/replay.cc  |  2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/tools/cabana/mainwin.cc b/tools/cabana/mainwin.cc
index 2d070acff..1ea3733ed 100644
--- a/tools/cabana/mainwin.cc
+++ b/tools/cabana/mainwin.cc
@@ -313,11 +313,19 @@ void MainWindow::loadFromClipboard(SourceSet s, bool close_all) {
 }
 
 void MainWindow::openStream(AbstractStream *stream, const QString &dbc_file) {
+  if (can) {
+    QObject::connect(can, &QObject::destroyed, this, [=]() { startStream(stream, dbc_file); });
+    can->deleteLater();
+  } else {
+    startStream(stream, dbc_file);
+  }
+}
+
+void MainWindow::startStream(AbstractStream *stream, QString dbc_file) {
   center_widget->clear();
   delete messages_widget;
   delete video_splitter;
 
-  delete can;
   can = stream;
   can->setParent(this);  // take ownership
   can->start();
diff --git a/tools/cabana/mainwin.h b/tools/cabana/mainwin.h
index 1da59f93e..92c2714ae 100644
--- a/tools/cabana/mainwin.h
+++ b/tools/cabana/mainwin.h
@@ -44,6 +44,7 @@ signals:
   void updateProgressBar(uint64_t cur, uint64_t total, bool success);
 
 protected:
+  void startStream(AbstractStream *stream, QString dbc_file);
   bool eventFilter(QObject *obj, QEvent *event) override;
   void remindSaveChanges();
   void closeFile(SourceSet s = SOURCE_ALL);
diff --git a/tools/replay/replay.cc b/tools/replay/replay.cc
index fb13ead03..cc105dd10 100644
--- a/tools/replay/replay.cc
+++ b/tools/replay/replay.cc
@@ -63,7 +63,6 @@ void Replay::setupSegmentManager(bool has_filters) {
 }
 
 Replay::~Replay() {
-  seg_mgr_.reset();
   if (stream_thread_.joinable()) {
     rInfo("shutdown: in progress...");
     interruptStream([this]() {
@@ -74,6 +73,7 @@ Replay::~Replay() {
     rInfo("shutdown: done");
   }
   camera_server_.reset();
+  seg_mgr_.reset();
 }
 
 bool Replay::load() {