summaryrefslogtreecommitdiffstats
path: root/widget/windows
diff options
context:
space:
mode:
authorDavid Major <dmajor@mozilla.com>2018-05-23 11:54:21 -0700
committerwolfbeast <mcwerewolf@gmail.com>2018-06-07 06:08:05 +0200
commit6b36aa089d31573cf9a72da530dc423b3978fda3 (patch)
tree1e4c3891c5f61f6eed4425d110601a89f5c9a09f /widget/windows
parent63d30436895af897f71c40669ca587b495d98649 (diff)
downloadUXP-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/windows')
-rw-r--r--widget/windows/GfxInfo.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/widget/windows/GfxInfo.cpp b/widget/windows/GfxInfo.cpp
index 8a429ad32..c62f5873e 100644
--- a/widget/windows/GfxInfo.cpp
+++ b/widget/windows/GfxInfo.cpp
@@ -1101,6 +1101,10 @@ GfxInfo::GetFeatureStatusImpl(int32_t aFeature,
if (aOS)
*aOS = os;
+ if (mShutdownOccurred) {
+ return NS_OK;
+ }
+
// Don't evaluate special cases if we're checking the downloaded blocklist.
if (!aDriverInfo.Length()) {
nsAutoString adapterVendorID;