From 9f7a9d85b46ff074abab10ecc1fa44dccf33ed3a Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Tue, 14 Apr 2020 23:42:31 +1000
Subject: [PATCH] ffmpegdecoder: fixed deadlock on non-video streams

---
 app/codec/ffmpeg/ffmpegdecoder.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/codec/ffmpeg/ffmpegdecoder.cpp b/app/codec/ffmpeg/ffmpegdecoder.cpp
index 39f6efec0..991d39f6c 100644
--- a/app/codec/ffmpeg/ffmpegdecoder.cpp
+++ b/app/codec/ffmpeg/ffmpegdecoder.cpp
@@ -1297,7 +1297,9 @@ void FFmpegDecoderInstance::ClearResources()
   ClearFrameCache();
 
   // Stop timer
-  QMetaObject::invokeMethod(&clear_timer_, "stop", Qt::BlockingQueuedConnection);
+  if (clear_timer_.isActive()) {
+    QMetaObject::invokeMethod(&clear_timer_, "stop", Qt::BlockingQueuedConnection);
+  }
 
   if (opts_) {
     av_dict_free(&opts_);