2 files changed, 52 insertions, 11 deletions
diff --git a/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs b/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs
index 334d636d6..42161a52d 100644
--- a/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs
+++ b/win/CS/HandBrake.ApplicationServices/Model/Encoding/SubtitleTrack.cs
@@ -151,17 +151,6 @@ namespace HandBrake.ApplicationServices.Model.Encoding
         }
 
         /// <summary>
-        ///   Gets a value indicating whether this is an SRT subtitle.
-        /// </summary>
-        public bool IsSrtSubtitle
-        {
-            get
-            {
-                return this.SrtFileName != "-" && this.SrtFileName != null;
-            }
-        }
-
-        /// <summary>
         ///   Gets or sets SourceTrack.
         /// </summary>
         public Subtitle SourceTrack
@@ -179,6 +168,9 @@ namespace HandBrake.ApplicationServices.Model.Encoding
                 {
                     this.Track = this.sourceTrack.ToString();
                 }
+
+                this.NotifyOfPropertyChange(() => this.CanBeBurned);
+                this.NotifyOfPropertyChange(() => this.CanBeForced);
             }
         }
 
@@ -231,5 +223,51 @@ namespace HandBrake.ApplicationServices.Model.Encoding
         public string Track { get; set; }
 
         #endregion
+
+        /// <summary>
+        /// Gets a value indicating whether CanForced.
+        /// </summary>
+        public bool CanBeForced
+        {
+            get
+            {
+                if (this.SourceTrack != null)
+                {
+                    return this.SourceTrack.SubtitleType == SubtitleType.VobSub || this.SourceTrack.SubtitleType == SubtitleType.PGS
+                        || this.SourceTrack.SubtitleType == SubtitleType.ForeignAudioSearch;
+                }
+
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether CanBeBurned.
+        /// </summary>
+        public bool CanBeBurned
+        {
+            get
+            {
+                if (this.SourceTrack != null)
+                {
+                    return this.SourceTrack.SubtitleType == SubtitleType.VobSub || this.SourceTrack.SubtitleType == SubtitleType.PGS
+                        || this.SourceTrack.SubtitleType == SubtitleType.ForeignAudioSearch || this.SourceTrack.SubtitleType == SubtitleType.SSA;
+                }
+
+                return false;
+            }
+        }
+
+
+        /// <summary>
+        ///   Gets a value indicating whether this is an SRT subtitle.
+        /// </summary>
+        public bool IsSrtSubtitle
+        {
+            get
+            {
+                return this.SrtFileName != "-" && this.SrtFileName != null;
+            }
+        }
     }
 }
 \ No newline at end of file
diff --git a/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs b/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs
index bab41a9b8..8337ddd56 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs
@@ -161,6 +161,9 @@ namespace HandBrake.ApplicationServices.Services
                 {
                     preset.Task = update.Task;
                     preset.UsePictureFilters = update.UsePictureFilters;
+                    preset.PictureSettingsMode = update.PictureSettingsMode;
+                    preset.Category = update.Category;
+                    preset.Description = update.Description;
 
                     // Update the presets file
                     this.UpdatePresetFiles();