Merge pull request #498 from legerch/fix-terminate-hanging

[player] Fix player hanging when terminate
valbok · Dec 4, 2024 · 27566fc · 27566fc
2 parents e427293 + e5b376c
commit 27566fc
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/QtAVPlayer/qavplayer.cpp b/src/QtAVPlayer/qavplayer.cpp
@@ -329,9 +329,13 @@ void QAVPlayerPrivate::terminate()
     if (dev)
         dev->abort(true);
     loaderFuture.waitForFinished();
-    demuxerFuture.waitForFinished();
     videoPlayFuture.waitForFinished();
     audioPlayFuture.waitForFinished();
+
+    demuxer.abort();
+    demuxerFuture.waitForFinished();
+    demuxer.abort(false);
+
     pendingPosition = 0;
     pendingSeek = false;
     currPts = 0.0;