Bug 1410794 - Follow-up. rs=bustage-fix
--- 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));