summaryrefslogtreecommitdiffstats
path: root/win/CS/HandBrakeWPF/Services
diff options
context:
space:
mode:
authorsr55 <[email protected]>2015-07-25 20:29:50 +0000
committersr55 <[email protected]>2015-07-25 20:29:50 +0000
commit0f53167a48fdb049021d0ea9128970c2a4e27e32 (patch)
tree91b0b04805163d92e296b0f00fece6523013eda9 /win/CS/HandBrakeWPF/Services
parent694a4c2c679424f2f9199cb8becae21302ff6623 (diff)
WinGui: Upgrade Caliburn to version 2.0.2
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7378 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF/Services')
-rw-r--r--win/CS/HandBrakeWPF/Services/Presets/Model/Preset.cs7
1 files changed, 6 insertions, 1 deletions
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
/// <summary>
/// A Preset for encoding with.
/// </summary>
- public class Preset : PropertyChangedBase
+ /// <remarks>
+ /// 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
+ /// </remarks>
+ public class Preset : HandBrake.ApplicationServices.Utilities.PropertyChangedBase // Delibery not
{
#region Constants and Fields