From 0f53167a48fdb049021d0ea9128970c2a4e27e32 Mon Sep 17 00:00:00 2001 From: sr55 Date: Sat, 25 Jul 2015 20:29:50 +0000 Subject: WinGui: Upgrade Caliburn to version 2.0.2 git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7378 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'win/CS/HandBrakeWPF/Services') diff --git a/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs b/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs index 8e43dc4bb..06d05e739 100644 --- a/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs +++ b/win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs @@ -21,7 +21,12 @@ namespace HandBrakeWPF.Services.Presets.Model /// /// A Preset for encoding with. /// - public class Preset : PropertyChangedBase + /// + /// Using App Services PropertyChangedBase because Caliburn Micro has [DataContract] on their base class which causes json.net not to serialise properties without [DataContract] + /// https://github.com/Caliburn-Micro/Caliburn.Micro/issues/89 + /// https://github.com/Caliburn-Micro/Caliburn.Micro/issues/96 + /// + public class Preset : HandBrake.ApplicationServices.Utilities.PropertyChangedBase // Delibery not { #region Constants and Fields -- cgit v1.2.3