Closed Bug 635665 Opened 13 years ago Closed 13 years ago

nsPrefBranch::GetComplexValue code incorrect after e10s merge

Categories

(Core :: Preferences: Backend, defect)

defect
Not set
normal

Tracking

()

RESOLVED FIXED
Tracking Status
blocking2.0 --- -

People

(Reporter: neil, Assigned: jag+mozilla)

References

Details

Attachments

(1 file)

The patch for bug 564048 landed in changeset 2f382be70ce7.
The patch for bug 568271 landed in changeset ee0c3deb3ac4.
However the merge changeset 155d97b3f8c9 mismerged the changes.
As far as I could tell this is the only change lost in nsPrefBranch.cpp
This needs a reviewer, right?
Comment on attachment 513976 [details] [diff] [review]
Remove duplicated code, re-do related change.

Yeah, asking the author of the original code (/me waves)
Attachment #513976 - Flags: review?(dwitte)
Assignee: nobody → jag-mozilla
Comment on attachment 513976 [details] [diff] [review]
Remove duplicated code, re-do related change.

Thanks! r=dwitte.
Attachment #513976 - Flags: review?(dwitte) → review+
Comment on attachment 513976 [details] [diff] [review]
Remove duplicated code, re-do related change.

This restores a previous change that was accidentally backed out as part of a merge. Specifically, this removes duplicated code (see the code above it) which currently makes us call e.g. GetDefaultFromPropertiesFile(...) twice.
Attachment #513976 - Flags: approval2.0?
Not blocking, but a=beltzner.
blocking2.0: ? → -
Attachment #513976 - Flags: approval2.0? → approval2.0+
Ready for checkin, if someone can get this that'd be great. :)
Keywords: checkin-needed
Thanks Josh.
Status: NEW → RESOLVED
Closed: 13 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: