Bug 1410794 - Follow-up. rs=bustage-fix
authorJorg K <jorgk@jorgk.com>
Mon, 30 Oct 2017 15:17:19 +0100
changeset 29290 fba3fa2958e743cb4210ed3449f7333250df8e63
parent 29289 97bf29612932b32707ddd6838047d364947eca13
child 29291 55b85200c486797aa83b96eafecd0467d22a30c6
push id2068
push userclokep@gmail.com
push dateMon, 13 Nov 2017 19:02:14 +0000
treeherdercomm-beta@9c7e7ce8672b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs1410794
Bug 1410794 - Follow-up. rs=bustage-fix
mail/components/migration/src/nsNetscapeProfileMigratorBase.cpp
--- a/mail/components/migration/src/nsNetscapeProfileMigratorBase.cpp
+++ b/mail/components/migration/src/nsNetscapeProfileMigratorBase.cpp
@@ -128,18 +128,22 @@ nsNetscapeProfileMigratorBase::GetProfil
   return NS_OK;
 
 nsresult
 nsNetscapeProfileMigratorBase::GetString(PrefTransform* aTransform,
                                          nsIPrefBranch* aBranch)
 {
   PrefTransform* xform = (PrefTransform*)aTransform;
   nsCString str;
-  GETPREF(xform, GetCharPref, str);
-  xform->stringValue = moz_xstrdup(str.get());
+  nsresult rv = aBranch->GetCharPref(xform->sourcePrefName, str);
+  if (NS_SUCCEEDED(rv)) {
+    xform->prefHasValue = true;
+    xform->stringValue = moz_xstrdup(str.get());
+  }
+  return rv;
 }
 
 nsresult
 nsNetscapeProfileMigratorBase::SetString(PrefTransform* aTransform,
                                          nsIPrefBranch* aBranch)
 {
   PrefTransform* xform = (PrefTransform*)aTransform;
   SETPREF(xform, SetCharPref, nsDependentCString(xform->stringValue));