Merge pull request #500 from valbok/immediate-exit

Abort before waiting
valbok · Dec 4, 2024 · e34d4ae · e34d4ae
2 parents 27566fc + f70581c
commit e34d4ae
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/QtAVPlayer/qavplayer.cpp b/src/QtAVPlayer/qavplayer.cpp
@@ -328,12 +328,11 @@ void QAVPlayerPrivate::terminate()
     subtitleClock.clear();
     if (dev)
         dev->abort(true);
+    demuxer.abort();
+    demuxerFuture.waitForFinished();
     loaderFuture.waitForFinished();
     videoPlayFuture.waitForFinished();
     audioPlayFuture.waitForFinished();
-
-    demuxer.abort();
-    demuxerFuture.waitForFinished();
     demuxer.abort(false);
 
     pendingPosition = 0;