From 6b36aa089d31573cf9a72da530dc423b3978fda3 Mon Sep 17 00:00:00 2001
From: David Major <dmajor@mozilla.com>
Date: Wed, 23 May 2018 11:54:21 -0700
Subject: Bug 1458270: Clean up in the shutdown observer. r=milan a=jcristau

--HG--
extra : amend_source : 7b1277a18a3ed4f441deef8b51cb4ec4dde614cc
---
 widget/cocoa/GfxInfo.mm | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'widget/cocoa/GfxInfo.mm')

diff --git a/widget/cocoa/GfxInfo.mm b/widget/cocoa/GfxInfo.mm
index 74333c514..85c469286 100644
--- a/widget/cocoa/GfxInfo.mm
+++ b/widget/cocoa/GfxInfo.mm
@@ -308,6 +308,10 @@ GfxInfo::GetFeatureStatusImpl(int32_t aFeature,
   if (aOS)
     *aOS = os;
 
+  if (mShutdownOccurred) {
+    return NS_OK;
+  }
+
   // Don't evaluate special cases when we're evaluating the downloaded blocklist.
   if (!aDriverInfo.Length()) {
     if (aFeature == nsIGfxInfo::FEATURE_WEBGL_MSAA) {
-- 
cgit v1.2.3