Wait for stop on exit

gavazquez · Mar 28, 2020 · ea4bcdb · ea4bcdb
1 parent c6f7a0d
commit ea4bcdb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/GazeTrackerCore/Lister/CameraLister.cs b/GazeTrackerCore/Lister/CameraLister.cs
@@ -35,7 +35,7 @@ public static IEnumerable<Camera> GetAvailableCameras()
                 videoSource.SignalToStop();
                 videoSource.WaitForStop();
 
-                var camera = new Camera(device.MonikerString, device.Name, resolutions, new RawImage(bitmap), CameraType.Ps3Eye);
+                var camera = new Camera(device.MonikerString, device.Name, resolutions, new RawImage(new Bitmap(bitmap)), CameraType.Ps3Eye);
                 bitmap = null;
 
                 yield return camera;

diff --git a/GazeTrackerCore/Producer/DirectShowFrameProducer.cs b/GazeTrackerCore/Producer/DirectShowFrameProducer.cs
@@ -37,6 +37,7 @@ public override void Dispose()
 		{
 			base.Dispose();
 			_videoSource.SignalToStop();
+			_videoSource.WaitForStop();
 		}
 
 		public override void ReadFrames(BroadcastBlock<FrameData> broadcast)