Merge pull request #510 from jbq/master

Fix NPE in WebcamDiscoveryService
sarxos · Nov 22, 2016 · c370505 · c370505
2 parents 7e82df6 + 407b39a
commit c370505
Showing 1 changed file with 3 additions and 0 deletions.
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
@@ -381,6 +381,9 @@ protected void shutdown() {
 
 		stop();
 
+		if (webcams == null)
+			return;
+
 		// dispose all webcams
 
 		Iterator<Webcam> wi = webcams.iterator();