From 94e4ec56db5ec596842894cb2713e54ff4679e00 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Mon, 4 Feb 2013 12:29:14 -0500
Subject: [PATCH] Bug 836599 - Part 6: Make MediaStreamGraphImpl::AppendMessage
 not assume that it's the only graph; r=roc

---
 content/media/MediaStreamGraph.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/content/media/MediaStreamGraph.cpp b/content/media/MediaStreamGraph.cpp
index 61527c06f3c..f3074d5b94e 100644
--- a/content/media/MediaStreamGraph.cpp
+++ b/content/media/MediaStreamGraph.cpp
@@ -1314,9 +1314,10 @@ MediaStreamGraphImpl::AppendMessage(ControlMessage* aMessage)
     aMessage->RunDuringShutdown();
     delete aMessage;
     if (IsEmpty()) {
-      NS_ASSERTION(gGraph == this, "Switched managers during forced shutdown?");
-      gGraph = nullptr;
-      delete this;
+      if (gGraph == this) {
+        gGraph = nullptr;
+        delete this;
+      }
     }
     return;
   }