From 10f5b22610f2a48c5d7e02b09818f64271a2a454 Mon Sep 17 00:00:00 2001 From: "braveyao@webrtc.org" Date: Thu, 11 Oct 2012 02:42:51 +0000 Subject: [PATCH] Issue 634: NSArray exception when getting video info when no camera attached - OSX BUG = Issue 634 TEST = NONE Review URL: https://webrtc-codereview.appspot.com/859006 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2904 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../main/source/Mac/QTKit/video_capture_qtkit_info_objc.mm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info_objc.mm b/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info_objc.mm index f40131c372..6bd2cfc61b 100644 --- a/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info_objc.mm +++ b/src/modules/video_capture/main/source/Mac/QTKit/video_capture_qtkit_info_objc.mm @@ -86,7 +86,7 @@ using namespace webrtc; return [NSNumber numberWithInt:0]; } - if(index > (WebRtc_UWord32)_captureDeviceCountInfo) + if(index >= (WebRtc_UWord32)_captureDeviceCountInfo) { return [NSNumber numberWithInt:-1]; } @@ -179,9 +179,7 @@ using namespace webrtc; inputDevicesWithMediaType:QTMediaTypeVideo]]; _captureDeviceCountInfo = _captureDevicesInfo.count; - if(_captureDeviceCountInfo < 1){ - return [NSNumber numberWithInt:0]; - } + return [NSNumber numberWithInt:0]; }