From 337bc06de1987d4e97165d897dea45056fb12881 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Fri, 20 Jun 2014 14:59:12 +0200
Subject: [PATCH] androidmedia: Clear exceptions also when we did not provide a
 GError

---
 sys/androidmedia/gstamc.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys/androidmedia/gstamc.c b/sys/androidmedia/gstamc.c
index 12a0603e49..bfea8da1a2 100644
--- a/sys/androidmedia/gstamc.c
+++ b/sys/androidmedia/gstamc.c
@@ -495,8 +495,11 @@ gst_amc_set_error_string (JNIEnv * env, GQuark domain, gint code, GError ** err,
 {
   jthrowable exception;
 
-  if (!err)
+  if (!err) {
+    if ((*env)->ExceptionCheck (env))
+      (*env)->ExceptionClear (env);
     return;
+  }
 
   if ((*env)->ExceptionCheck (env)) {
     if ((exception = (*env)->ExceptionOccurred (env))) {