From 0f4e33c33e1627aa0dc6ca21519c19e724973ca9 Mon Sep 17 00:00:00 2001 From: Ruwen Hahn Date: Fri, 7 Jun 2024 15:41:36 +0200 Subject: [PATCH] UI: Discard state if stream attempt is canceled Repro steps: 1. Enable an incompatible setting in settings 2. Start stream, hit cancel on incompatible settings dialog 3. Disable incompatible setting in settings 4. Start stream -> crash --- UI/multitrack-video-output.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/UI/multitrack-video-output.cpp b/UI/multitrack-video-output.cpp index 97363bb60..09f723969 100644 --- a/UI/multitrack-video-output.cpp +++ b/UI/multitrack-video-output.cpp @@ -688,6 +688,9 @@ bool MultitrackVideoOutput::HandleIncompatibleSettings( return true; } + MultitrackVideoOutput::ReleaseOnMainThread(take_current()); + MultitrackVideoOutput::ReleaseOnMainThread(take_current_stream_dump()); + return false; }