Merge pull request #358 from JLLeitschuh/fix/onStopPipeline

Fixes stopped camera exception stop pipeline event

Author: ThomasJClark

core/src/main/java/edu/wpi/grip/core/sources/CameraSource.java

@@ -334,8 +334,10 @@ private static Properties createProperties(int deviceNumber) {
      * @param event
      */
     @Subscribe
-    public synchronized void onStopPipeline(StopPipelineEvent event) throws InterruptedException, IOException, TimeoutException {
-        this.stop();
+    public void onStopPipeline(StopPipelineEvent event) throws InterruptedException, IOException, TimeoutException {
+        if (this.isStarted()) {
+            this.stop();
+        }
     }
 
 }

core/src/test/java/edu/wpi/grip/core/sources/CameraSourceTest.java

@@ -7,6 +7,7 @@
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import edu.wpi.grip.core.GRIPCoreModule;
+import edu.wpi.grip.core.events.StopPipelineEvent;
 import edu.wpi.grip.core.events.UnexpectedThrowableEvent;
 import edu.wpi.grip.core.util.MockExceptionWitness;
 import org.bytedeco.javacpp.indexer.Indexer;
@@ -186,4 +187,11 @@ public void testStartingTwiceShouldThrowIllegalState() throws Exception {
         fail("The test should have failed with an IllegalStateException");
     }
 
+
+    @Test
+    public void testStopPipelineEventDoesntThrowWhenCameraStopped() throws Exception {
+        cameraSourceWithMockGrabber.onStopPipeline(new StopPipelineEvent());
+        assertFalse("The camera source should not be running", cameraSourceWithMockGrabber.isStarted());
+    }
+
 }