bug 746457 - fix bustage in reading extension default prefs (not covered by tests) from changeset ef55c163a23a (bug 725408); r,a=bustage
authorMyk Melez <myk@mozilla.org>
Tue, 17 Apr 2012 23:58:12 -0700
changeset 95198 0c7e2911be75b12aa98e83800231cecf127ec997
parent 95197 93dfd98900ad8e01e64e0bafb8880209777c5811
child 95199 28ebf87f14a9ed3bbd2ff99b853f24d8eb6e7592
push id886
push userlsblakk@mozilla.com
push dateMon, 04 Jun 2012 19:57:52 +0000
treeherdermozilla-beta@bbd8d5efd6d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs746457, 725408
milestone14.0a1
first release with
nightly linux32
0c7e2911be75 / 14.0a1 / 20120418030652 / files
nightly linux64
0c7e2911be75 / 14.0a1 / 20120418030652 / files
nightly mac
0c7e2911be75 / 14.0a1 / 20120418030652 / files
nightly win32
0c7e2911be75 / 14.0a1 / 20120418030652 / files
nightly win64
0c7e2911be75 / 14.0a1 / 20120418030652 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 746457 - fix bustage in reading extension default prefs (not covered by tests) from changeset ef55c163a23a (bug 725408); r,a=bustage
toolkit/xre/nsXREDirProvider.cpp
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -464,16 +464,19 @@ LoadDirsIntoArray(nsCOMArray<nsIFile>& a
 
     nsCAutoString leaf;
     appended->GetNativeLeafName(leaf);
     if (!Substring(leaf, leaf.Length() - 4).Equals(NS_LITERAL_CSTRING(".xpi"))) {
       LoadDirIntoArray(appended,
                        aAppendList,
                        aDirectories);
     }
+
+    if (NS_SUCCEEDED(appended->Exists(&exists)) && exists)
+      aDirectories.AppendObject(appended);
   }
 }
 
 NS_IMETHODIMP
 nsXREDirProvider::GetFiles(const char* aProperty, nsISimpleEnumerator** aResult)
 {
   nsresult rv;