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/GfxInfoX11.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'widget/GfxInfoX11.cpp')

diff --git a/widget/GfxInfoX11.cpp b/widget/GfxInfoX11.cpp
index 48fc3dbb5..338dcac67 100644
--- a/widget/GfxInfoX11.cpp
+++ b/widget/GfxInfoX11.cpp
@@ -268,8 +268,6 @@ GfxInfo::GetFeatureStatusImpl(int32_t aFeature,
                               OperatingSystem* aOS /* = nullptr */)
 
 {
-  GetData();
-
   NS_ENSURE_ARG_POINTER(aStatus);
   *aStatus = nsIGfxInfo::FEATURE_STATUS_UNKNOWN;
   aSuggestedDriverVersion.SetIsVoid(true);
@@ -277,6 +275,12 @@ GfxInfo::GetFeatureStatusImpl(int32_t aFeature,
   if (aOS)
     *aOS = os;
 
+  if (mShutdownOccurred) {
+    return NS_OK;
+  }
+
+  GetData();
+
   if (mGLMajorVersion == 1) {
     // We're on OpenGL 1. In most cases that indicates really old hardware.
     // We better block them, rather than rely on them to fail gracefully, because they don't!
-- 
cgit v1.2.3