From e49c7fa2bf3bbc2eb6aa851c51d82f1cfd6b9212 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Tue, 24 Jan 2023 02:16:11 +0800 Subject: [PATCH] cabana: fix slider crash on exit if loadThumbnails is running (#27052) --- tools/cabana/videowidget.cc | 5 +++++ tools/cabana/videowidget.h | 1 + 2 files changed, 6 insertions(+) diff --git a/tools/cabana/videowidget.cc b/tools/cabana/videowidget.cc index 7d46769a47..729302adaa 100644 --- a/tools/cabana/videowidget.cc +++ b/tools/cabana/videowidget.cc @@ -133,6 +133,11 @@ Slider::Slider(QWidget *parent) : QSlider(Qt::Horizontal, parent) { QObject::connect(can, &AbstractStream::streamStarted, this, &Slider::streamStarted); } +Slider::~Slider() { + abort_load_thumbnail = true; + thumnail_future.waitForFinished(); +} + void Slider::streamStarted() { abort_load_thumbnail = true; thumnail_future.waitForFinished(); diff --git a/tools/cabana/videowidget.h b/tools/cabana/videowidget.h index 6b4c02c573..392db23512 100644 --- a/tools/cabana/videowidget.h +++ b/tools/cabana/videowidget.h @@ -18,6 +18,7 @@ class Slider : public QSlider { public: Slider(QWidget *parent); + ~Slider(); private: void mousePressEvent(QMouseEvent *e) override;