From 4f403fa1964367102badc90762074de906f24995 Mon Sep 17 00:00:00 2001
From: Chris Jones <jones.chris.g@gmail.com>
Date: Thu, 29 Jul 2010 14:15:13 -0500
Subject: [PATCH] Bug 582486: Don't read an unused pref when unregistering from
 the category manager. r=josh

---
 modules/plugin/base/src/nsPluginTags.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/plugin/base/src/nsPluginTags.cpp b/modules/plugin/base/src/nsPluginTags.cpp
index 25ab25c61b9..65bef582252 100644
--- a/modules/plugin/base/src/nsPluginTags.cpp
+++ b/modules/plugin/base/src/nsPluginTags.cpp
@@ -441,11 +441,13 @@ nsPluginTag::RegisterWithCategoryManager(PRBool aOverrideInternalTypes,
   // plugins - without relying on implementation details such as prefs/category
   // manager entries.
   nsXPIDLCString overrideTypes;
-  psvc->GetCharPref("plugin.disable_full_page_plugin_for_types", getter_Copies(overrideTypes));
   nsCAutoString overrideTypesFormatted;
-  overrideTypesFormatted.Assign(',');
-  overrideTypesFormatted += overrideTypes;
-  overrideTypesFormatted.Append(',');
+  if (aType != ePluginUnregister) {
+    psvc->GetCharPref("plugin.disable_full_page_plugin_for_types", getter_Copies(overrideTypes));
+    overrideTypesFormatted.Assign(',');
+    overrideTypesFormatted += overrideTypes;
+    overrideTypesFormatted.Append(',');
+  }
   
   nsACString::const_iterator start, end;
   for (int i = 0; i < mVariants; i++) {