From e65c9a6e67e589e27d08e8541603db1ef898976a Mon Sep 17 00:00:00 2001 From: "buildbot@webrtc.org" Date: Tue, 6 May 2014 17:28:28 +0000 Subject: [PATCH] (Auto)update libjingle 66299810-> 66301332 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6063 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/media/devices/devicemanager.cc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/talk/media/devices/devicemanager.cc b/talk/media/devices/devicemanager.cc index 75b935ce59..d6745bba3a 100644 --- a/talk/media/devices/devicemanager.cc +++ b/talk/media/devices/devicemanager.cc @@ -39,6 +39,8 @@ #include "talk/media/devices/filevideocapturer.h" #include "talk/media/devices/yuvframescapturer.h" +#if !defined(IOS) + #if defined(HAVE_WEBRTC_VIDEO) #include "talk/media/webrtc/webrtcvideocapturer.h" #endif @@ -49,6 +51,8 @@ #endif +#endif + namespace { bool StringMatchWithWildcard( @@ -97,7 +101,7 @@ DeviceManager::~DeviceManager() { bool DeviceManager::Init() { if (!initialized()) { - if (!watcher()->Start()) { + if (watcher() && !watcher()->Start()) { return false; } set_initialized(true); @@ -107,7 +111,9 @@ bool DeviceManager::Init() { void DeviceManager::Terminate() { if (initialized()) { - watcher()->Stop(); + if (watcher()) { + watcher()->Stop(); + } set_initialized(false); } }