Prevent double panic in the Drop of TaksPoolInner

bevyengine · Dec 14, 2020 · 8ed9244 · 8ed9244
1 parent e511cdb
commit 8ed9244
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/crates/bevy_tasks/src/task_pool.rs b/crates/bevy_tasks/src/task_pool.rs
@@ -69,10 +69,12 @@ impl Drop for TaskPoolInner {
     fn drop(&mut self) {
         self.shutdown_tx.close();
 
+        let panicking = thread::panicking();
         for join_handle in self.threads.drain(..) {
-            join_handle
-                .join()
-                .expect("Task thread panicked while executing.");
+            let res = join_handle.join();
+            if !panicking {
+                res.expect("Task thread panicked while executing.");
+            }
         }
     }
 }