diff options
| author | sr55 <[email protected]> | 2014-08-21 15:47:07 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2014-08-21 15:47:07 +0000 |
| commit | 2839ca4c710c080467da7f9d485446400b1e4588 (patch) | |
| tree | 7e92e723d206a758e66353090654f4dae136dbef /win/CS/HandBrakeWPF/ViewModels | |
| parent | 084f08caa5811d92c8865e9ec46a7849f00a9294 (diff) | |
WinGui: Use OutputFormat display name, rather than the enum name.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6330 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF/ViewModels')
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs | 4 | ||||
| -rw-r--r-- | win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs index c91a917f8..fafc1ce2b 100644 --- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs @@ -1527,10 +1527,8 @@ namespace HandBrakeWPF.ViewModels this.SelectedOutputFormat = OutputFormat.Mkv;
break;
case ".mp4":
- this.SelectedOutputFormat = OutputFormat.Mp4;
- break;
case ".m4v":
- this.SelectedOutputFormat = OutputFormat.M4V;
+ this.SelectedOutputFormat = OutputFormat.Mp4;
break;
}
diff --git a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs index 0219c49af..0161c562b 100644 --- a/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/SubtitlesViewModel.cs @@ -590,7 +590,7 @@ namespace HandBrakeWPF.ViewModels if ((source.SubtitleType == SubtitleType.PGS || source.SubtitleType == SubtitleType.VobSub || source.SubtitleType == SubtitleType.ForeignAudioSearch)
&& this.Task != null
- && (this.Task.OutputFormat == OutputFormat.Mp4 || this.Task.OutputFormat == OutputFormat.M4V))
+ && this.Task.OutputFormat == OutputFormat.Mp4)
{
if (track.CanBeBurned)
{
|