From 7ba730e8d81a1213fa4cdad7bf4d0ee9140baecd Mon Sep 17 00:00:00 2001
From: Sotaro Ikeda <sikeda@mozilla.com>
Date: Fri, 10 Apr 2015 07:39:36 -0700
Subject: [PATCH] Bug 1153050 - Add ICameraControl check to
 MediaEngineGonkVideoSource::Start() r=jesup

---
 dom/media/webrtc/MediaEngineGonkVideoSource.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dom/media/webrtc/MediaEngineGonkVideoSource.cpp b/dom/media/webrtc/MediaEngineGonkVideoSource.cpp
index 81e10958e995..32438072f31a 100644
--- a/dom/media/webrtc/MediaEngineGonkVideoSource.cpp
+++ b/dom/media/webrtc/MediaEngineGonkVideoSource.cpp
@@ -221,8 +221,11 @@ MediaEngineGonkVideoSource::Start(SourceMediaStream* aStream, TrackID aID)
 
   ReentrantMonitorAutoEnter sync(mCallbackMonitor);
 
+  MOZ_ASSERT(mCameraControl, "mCameraControl is nullptr");
   if (mState == kStarted) {
     return NS_OK;
+  } else if (!mCameraControl) {
+    return NS_ERROR_FAILURE;
   }
   mTrackID = aID;
   mImageContainer = layers::LayerManager::CreateImageContainer();