From a76dabb12734154177a78033324b40365e7c6f21 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Wed, 21 Jul 2021 14:46:48 +0200 Subject: Fix freeze on search reset in manga combined plugin. Fix multithreading issues in AsyncTask --- src/QuickMedia.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/QuickMedia.cpp') diff --git a/src/QuickMedia.cpp b/src/QuickMedia.cpp index 723e8ec..161ea1a 100644 --- a/src/QuickMedia.cpp +++ b/src/QuickMedia.cpp @@ -2133,6 +2133,7 @@ namespace QuickMedia { } if(associated_data.search_text_updated && associated_data.fetch_status == FetchStatus::LOADING && associated_data.fetch_type == FetchType::SEARCH && associated_data.fetch_future.valid()) { + tabs[i].page->cancel_operation(); associated_data.fetch_future.cancel(); associated_data.fetch_status = FetchStatus::NONE; } @@ -2580,8 +2581,6 @@ namespace QuickMedia { std::string audio_url; bool has_embedded_audio = true; - - std::string prev_start_time; std::vector media_chapters; @@ -2693,9 +2692,7 @@ namespace QuickMedia { if(youtube_audio_media_proxy) youtube_audio_media_proxy->stop(); - if(youtube_downloader_task.valid()) - youtube_downloader_task.cancel(); - + youtube_downloader_task.cancel(); youtube_video_media_proxy.reset(); youtube_audio_media_proxy.reset(); @@ -2969,9 +2966,7 @@ namespace QuickMedia { if(youtube_audio_media_proxy) youtube_audio_media_proxy->stop(); - if(youtube_downloader_task.valid()) - youtube_downloader_task.cancel(); - + youtube_downloader_task.cancel(); youtube_video_media_proxy.reset(); youtube_audio_media_proxy.reset(); } -- cgit v1.2.3