diff options
| author | David Major <dmajor@mozilla.com> | 2018-05-23 11:54:21 -0700 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-06-07 06:08:05 +0200 |
| commit | 6b36aa089d31573cf9a72da530dc423b3978fda3 (patch) | |
| tree | 1e4c3891c5f61f6eed4425d110601a89f5c9a09f /widget/GfxInfoX11.cpp | |
| parent | 63d30436895af897f71c40669ca587b495d98649 (diff) | |
| download | UXP-6b36aa089d31573cf9a72da530dc423b3978fda3.tar UXP-6b36aa089d31573cf9a72da530dc423b3978fda3.tar.gz UXP-6b36aa089d31573cf9a72da530dc423b3978fda3.tar.lz UXP-6b36aa089d31573cf9a72da530dc423b3978fda3.tar.xz UXP-6b36aa089d31573cf9a72da530dc423b3978fda3.zip | |
Bug 1458270: Clean up in the shutdown observer. r=milan a=jcristau
--HG--
extra : amend_source : 7b1277a18a3ed4f441deef8b51cb4ec4dde614cc
Diffstat (limited to 'widget/GfxInfoX11.cpp')
| -rw-r--r-- | widget/GfxInfoX11.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
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! |