Fix freeze on search reset in manga combined plugin. Fix multithreading issues in AsyncTask

4 files changed, 23 insertions, 13 deletions

diff --git a/src/Downloader.cpp b/src/Downloader.cpp
index ffb8675..ae84973 100644
--- a/src/Downloader.cpp
+++ b/src/Downloader.cpp
@@ -384,9 +384,7 @@ namespace QuickMedia {
         if(youtube_audio_media_proxy)
             youtube_audio_media_proxy->stop();
 
-        if(downloader_task.valid())
-            downloader_task.cancel();
-
+        downloader_task.cancel();
         youtube_video_media_proxy.reset();
         youtube_audio_media_proxy.reset();
 
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();
                                 }
diff --git a/src/plugins/MangaCombined.cpp b/src/plugins/MangaCombined.cpp
index 1745ee0..5440871 100644
--- a/src/plugins/MangaCombined.cpp
+++ b/src/plugins/MangaCombined.cpp
@@ -23,10 +23,14 @@ namespace QuickMedia {
 
         int accumulated_sleep_time = 0;
         while(true) {
+            size_t num_dead_threads = 0;
             for(size_t i = 0; i < search_threads.size(); ++i) {
                 auto &search_thread = search_threads[i];
-                if(!search_thread.second.valid())
+                if(!search_thread.second.valid()) {
+                    if(!plugin_finished_state[i].second)
+                        ++num_dead_threads;
                     continue;
+                }
 
                 if(!search_thread.second.ready())
                     continue;
@@ -40,6 +44,9 @@ namespace QuickMedia {
                 }
             }
 
+            if(num_dead_threads == search_threads.size())
+                break;
+
             size_t num_finished_plugins = 0;
             for(auto &f : plugin_finished_state) {
                 if(f.second)
@@ -58,7 +65,7 @@ namespace QuickMedia {
                 break;
             }
 
-            int sleep_time_ms = 200;
+            int sleep_time_ms = 50;
             std::this_thread::sleep_for(std::chrono::milliseconds(sleep_time_ms));
             accumulated_sleep_time += sleep_time_ms;
             if(accumulated_sleep_time >= SEARCH_TIMEOUT_MILLISECONDS) {
@@ -114,4 +121,11 @@ namespace QuickMedia {
         if(!page) return PluginResult::OK;
         return page->submit(title, url, result_tabs);
     }
+
+    void MangaCombinedSearchPage::cancel_operation() {
+        for(auto &search_thread : search_threads) {
+            search_thread.second.cancel();
+        }
+        search_threads.clear();
+    }
 }
\ No newline at end of file
diff --git a/src/plugins/Youtube.cpp b/src/plugins/Youtube.cpp
index 2fd193f..cd3fddd 100644
--- a/src/plugins/Youtube.cpp
+++ b/src/plugins/Youtube.cpp
@@ -1667,6 +1667,9 @@ R"END(
         const time_t time_now = time(nullptr);
 
         for(const std::string &channel_id : channel_ids) {
+            if(program_is_dead_in_current_thread())
+                return PluginResult::OK;
+
             subscription_load_tasks[async_task_index] = AsyncTask<std::vector<YoutubeSubscriptionTaskResult>>([&channel_id, time_now]() -> std::vector<YoutubeSubscriptionTaskResult> {
                 std::string website_data;
                 DownloadResult result = download_to_string("https://www.youtube.com/feeds/videos.xml?channel_id=" + url_param_encode(channel_id), website_data, {}, false);