From aa39ee6f8c2aa9d3ee64a3a054570a8bec883fad Mon Sep 17 00:00:00 2001
From: Andrew Osmond <aosmond@mozilla.com>
Date: Thu, 25 May 2017 06:43:59 -0400
Subject: [PATCH] Bug 1367150 - Do not attempt to create PresentationChild if
 ContentChild is shutting down. r=ehsan

---
 dom/presentation/ipc/PresentationIPCService.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dom/presentation/ipc/PresentationIPCService.cpp b/dom/presentation/ipc/PresentationIPCService.cpp
index 3b6bdd9b75e2..5e2273c3c871 100644
--- a/dom/presentation/ipc/PresentationIPCService.cpp
+++ b/dom/presentation/ipc/PresentationIPCService.cpp
@@ -35,7 +35,7 @@ NS_IMPL_ISUPPORTS(PresentationIPCService,
 PresentationIPCService::PresentationIPCService()
 {
   ContentChild* contentChild = ContentChild::GetSingleton();
-  if (NS_WARN_IF(!contentChild)) {
+  if (NS_WARN_IF(!contentChild || contentChild->IsShuttingDown())) {
     return;
   }
   sPresentationChild = new PresentationChild(this);