aboutsummaryrefslogtreecommitdiff
path: root/src/QuickMedia.cpp
diff options
context:
space:
mode:
authordec05eba <dec05eba@protonmail.com>2021-07-21 14:46:48 +0200
committerdec05eba <dec05eba@protonmail.com>2021-07-21 14:46:48 +0200
commita76dabb12734154177a78033324b40365e7c6f21 (patch)
treedab1d6b997ba283dfcc7f9dd12adee96dd631dc2 /src/QuickMedia.cpp
parent3c16cb376669e4ae500d22529b40112c761088c0 (diff)
Fix freeze on search reset in manga combined plugin. Fix multithreading issues in AsyncTask
Diffstat (limited to 'src/QuickMedia.cpp')
-rw-r--r--src/QuickMedia.cpp11
1 files changed, 3 insertions, 8 deletions
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<MediaChapter> 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();
}