From 407b39a2785906f0b1b2ee5e24335efab13cbc89 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Quenot Date: Tue, 22 Nov 2016 11:03:42 +0100 Subject: [PATCH] Fix NPE in WebcamDiscoveryService --- .../java/com/github/sarxos/webcam/WebcamDiscoveryService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/webcam-capture/src/main/java/com/github/sarxos/webcam/WebcamDiscoveryService.java b/webcam-capture/src/main/java/com/github/sarxos/webcam/WebcamDiscoveryService.java index 5c7678e2..d92ee78a 100644 --- a/webcam-capture/src/main/java/com/github/sarxos/webcam/WebcamDiscoveryService.java +++ b/webcam-capture/src/main/java/com/github/sarxos/webcam/WebcamDiscoveryService.java @@ -381,6 +381,9 @@ protected void shutdown() { stop(); + if (webcams == null) + return; + // dispose all webcams Iterator wi = webcams.iterator();