From 04a35db2357649eb604ca24ed058d7c70c8af2f5 Mon Sep 17 00:00:00 2001
From: Joe Drew <joe@drew.ca>
Date: Tue, 11 Oct 2011 17:18:56 -0400
Subject: [PATCH] Bug 693813 - Don't evaluate our blacklisting logic if we're
 being called for a downloaded blacklist entry. r=bjacob

---
 widget/src/xpwidgets/GfxInfoX11.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/widget/src/xpwidgets/GfxInfoX11.cpp b/widget/src/xpwidgets/GfxInfoX11.cpp
index 900e03da147..42431a19f4a 100644
--- a/widget/src/xpwidgets/GfxInfoX11.cpp
+++ b/widget/src/xpwidgets/GfxInfoX11.cpp
@@ -253,6 +253,12 @@ GfxInfo::GetFeatureStatusImpl(PRInt32 aFeature, PRInt32 *aStatus, nsAString & aS
     *aStatus = nsIGfxInfo::FEATURE_NO_INFO;
     aSuggestedDriverVersion.SetIsVoid(PR_TRUE);
 
+    if (aDriverInfo) {
+      // We don't implement the downloaded blacklist yet. Don't evaluate
+      // anything.
+      return NS_OK;
+    }
+
 #ifdef MOZ_PLATFORM_MAEMO
     // on Maemo, the glxtest probe doesn't build, and we don't really need GfxInfo anyway
     return NS_OK;