From a63bb3f745bb3d6620f9b9592372f9efcd95a512 Mon Sep 17 00:00:00 2001
From: yanchith <yanchi.toth@gmail.com>
Date: Tue, 20 Aug 2019 00:18:12 +0200
Subject: [PATCH] Prevent possible double panic in Drop impls

Drop impls for SwapChainOutput, RenderPass and ComputePass now only
call out to wgn if not thread::panicking().
---
 src/lib.rs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 81c93e81b5..1ae89152df 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -8,6 +8,7 @@ use std::ffi::CString;
 use std::ops::Range;
 use std::ptr;
 use std::slice;
+use std::thread;
 
 pub use wgn::winit;
 pub use wgn::{
@@ -1217,7 +1218,9 @@ impl<'a> RenderPass<'a> {
 
 impl<'a> Drop for RenderPass<'a> {
     fn drop(&mut self) {
-        wgn::wgpu_render_pass_end_pass(self.id);
+        if !thread::panicking() {
+            wgn::wgpu_render_pass_end_pass(self.id);
+        }
     }
 }
 
@@ -1253,7 +1256,9 @@ impl<'a> ComputePass<'a> {
 
 impl<'a> Drop for ComputePass<'a> {
     fn drop(&mut self) {
-        wgn::wgpu_compute_pass_end_pass(self.id);
+        if !thread::panicking() {
+            wgn::wgpu_compute_pass_end_pass(self.id);
+        }
     }
 }
 
@@ -1275,7 +1280,9 @@ impl<'a> Queue<'a> {
 
 impl<'a> Drop for SwapChainOutput<'a> {
     fn drop(&mut self) {
-        wgn::wgpu_swap_chain_present(*self.swap_chain_id);
+        if !thread::panicking() {
+            wgn::wgpu_swap_chain_present(*self.swap_chain_id);
+        }
     }
 }