Bug 1047121: mis-merge bustage fix rs=bustage a=bustage
authorRandell Jesup <rjesup@jesup.org>
Thu, 07 Aug 2014 05:04:41 -0400
changeset 217395 d09fe5c4d537ba696bc3df98fcb641e3b5b523b8
parent 217394 b2e3d8e9ea6c52baa4b248860cba0895c9d7c320
child 217396 e7f718f619ba6c7d142f84fc9b5a8eccc3deae29
push id515
push userraliiev@mozilla.com
push dateMon, 06 Oct 2014 12:51:51 +0000
treeherdermozilla-release@267c7a481bef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage, bustage
bugs1047121
milestone33.0a2
Bug 1047121: mis-merge bustage fix rs=bustage a=bustage
content/media/webrtc/MediaEngineWebRTC.cpp
--- a/content/media/webrtc/MediaEngineWebRTC.cpp
+++ b/content/media/webrtc/MediaEngineWebRTC.cpp
@@ -379,17 +379,17 @@ MediaEngineWebRTC::Shutdown()
     mScreenEngine->SetTraceCallback(nullptr);
     webrtc::VideoEngine::Delete(mScreenEngine);
   }
   if (mWinEngine) {
     mWinEngine->SetTraceCallback(nullptr);
     webrtc::VideoEngine::Delete(mWinEngine);
   }
   if (mAppEngine) {
-    mBrowserEngine->SetTraceCallback(nullptr);
+    mAppEngine->SetTraceCallback(nullptr);
     webrtc::VideoEngine::Delete(mAppEngine);
   }
 
   if (mVoiceEngine) {
     mVoiceEngine->SetTraceCallback(nullptr);
     webrtc::VoiceEngine::Delete(mVoiceEngine);
   }