From 37bba316444944cad79d5f5ada5e17ada532b074 Mon Sep 17 00:00:00 2001
From: Mike Habicher <mhabicher@mozilla.com>
Date: Fri, 30 Nov 2012 18:26:58 -0800
Subject: [PATCH] Bug 809259 - fix for buffer exhaustion when cycling camera
 modes. r=cjones a=blocking-basecamp

---
 dom/camera/DOMCameraPreview.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dom/camera/DOMCameraPreview.cpp b/dom/camera/DOMCameraPreview.cpp
index a80285231bd5..50075f687d4b 100644
--- a/dom/camera/DOMCameraPreview.cpp
+++ b/dom/camera/DOMCameraPreview.cpp
@@ -251,8 +251,6 @@ DOMCameraPreview::StopPreview()
   DOM_CAMERA_LOGI("Stopping preview stream\n");
   mState = STOPPING;
   mCameraControl->StopPreview();
-  mInput->EndTrack(TRACK_VIDEO);
-  mInput->Finish();
 }
 
 void
@@ -260,6 +258,8 @@ DOMCameraPreview::SetStateStopped()
 {
   NS_ASSERTION(NS_IsMainThread(), "SetStateStopped() not called from main thread");
 
+  mInput->EndTrack(TRACK_VIDEO);
+  mInput->Finish();
   mState = STOPPED;
   DOM_CAMERA_LOGI("Preview stream stopped\n");