Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 9 insertions, 8 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Video/DefaultVideoCaptureProvider.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Video/DefaultVideoCaptureProvider.cs
index 3aa9d4c88..f710cf082 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Video/DefaultVideoCaptureProvider.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.Common/Video/DefaultVideoCaptureProvider.cs
@@ -28,16 +28,17 @@ namespace Tango.MachineStudio.Common.Video
 
             var availableDevices = CaptureDevice.GetAvailableCaptureDevices();
 
-            for (int i = 0; i < 3; i++)
+            for (int i = 0; i < availableDevices.Count; i++)
             {
-                if (i > availableDevices.Count - 1)
-                {
-                    AvailableCaptureDevices.Add(new CaptureDevice() { Device = null });
-                }
-                else
+                AvailableCaptureDevices.Add(new CaptureDevice() { Device = availableDevices[i] });
+            }
+
+            while (AvailableCaptureDevices.Count < 3)
+            {
+                AvailableCaptureDevices.Add(new CaptureDevice()
                 {
-                    AvailableCaptureDevices.Add(new CaptureDevice() { Device = availableDevices[i] });
-                }
+                    Device = null,
+                });
             }
         }
     }