From cea5d4d03ef01e1e5dc9503d04a87d1e939d2af2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Mon, 4 Dec 2017 21:49:27 +0200
Subject: [PATCH] Require fallback value in Element::catch_panic() to be given
 as closure

---
 gst-plugin/src/element.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gst-plugin/src/element.rs b/gst-plugin/src/element.rs
index 05d60b84..1e0b957b 100644
--- a/gst-plugin/src/element.rs
+++ b/gst-plugin/src/element.rs
@@ -103,9 +103,9 @@ pub unsafe trait ElementBase: IsA<gst::Element> + ObjectType {
         }
     }
 
-    fn catch_panic<F: FnOnce(&Self) -> T, T>(&self, fallback: T, f: F) -> T {
+    fn catch_panic<T, F: FnOnce(&Self) -> T, G: FnOnce() -> T>(&self, fallback: G, f: F) -> T {
         let panicked = unsafe { &(*self.get_instance()).panicked };
-        panic_to_error!(self, panicked, fallback, { f(self) })
+        panic_to_error!(self, panicked, fallback(), { f(self) })
     }
 }