From 0f908fe3a8c3bf4b17e7150110f9cd0ada57f1d0 Mon Sep 17 00:00:00 2001
From: Jonathan Feinberg <jdf@pobox.com>
Date: Sun, 18 May 2014 23:48:56 -0400
Subject: [PATCH] Factor out code that fires the captureEvent.

---
 .../video/src/processing/video/Capture.java    | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/java/libraries/video/src/processing/video/Capture.java b/java/libraries/video/src/processing/video/Capture.java
index 1d5eefeef..8f737edf1 100644
--- a/java/libraries/video/src/processing/video/Capture.java
+++ b/java/libraries/video/src/processing/video/Capture.java
@@ -1018,20 +1018,9 @@ public class Capture extends PImage implements PConstants {
       return;
     }
 
-    // Creates a captureEvent.
-    if (captureEventMethod != null) {
-      try {
-        captureEventMethod.invoke(eventHandler, this);
-      } catch (Exception e) {
-        System.err.println(
-          "error, disabling captureEvent() for capture object");
-        e.printStackTrace();
-        captureEventMethod = null;
-      }
-    }
+    fireCaptureEvent();
   }
 
-
   protected synchronized void invokeEvent(int w, int h, Buffer buffer) {
     available = true;
     bufWidth = w;
@@ -1044,6 +1033,10 @@ public class Capture extends PImage implements PConstants {
     }    
     natBuffer = buffer;
 
+    fireCaptureEvent();
+  }
+
+  private void fireCaptureEvent() {
     // Creates a captureEvent.
     if (captureEventMethod != null) {
       try {
@@ -1057,7 +1050,6 @@ public class Capture extends PImage implements PConstants {
     }
   }
 
-
   ////////////////////////////////////////////////////////////
 
   // Stream query methods.