WinGui: When Changing the output format, limit to only valid choices in the video and audio encoder dropdowns.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4688 b64f7644-9d1e-0410-96f1-a4d463321fa5

1 files changed, 5 insertions, 5 deletions

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 8a3f2eb60..6c5576442 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -689,9 +689,14 @@ namespace HandBrakeWPF.ViewModels
             set

             {

                 this.selectedOutputFormat = value;

+                this.CurrentTask.OutputFormat = value;

                 this.NotifyOfPropertyChange(() => SelectedOutputFormat);

+                this.NotifyOfPropertyChange(() => this.CurrentTask.OutputFormat);

                 this.NotifyOfPropertyChange(() => IsMkv);

                 this.SetExtension(string.Format(".{0}", this.selectedOutputFormat.ToString().ToLower())); // TODO, tidy up

+

+                this.VideoViewModel.RefreshTask();

+                this.AudioViewModel.RefreshTask();

             }

         }

 

@@ -1196,19 +1201,15 @@ namespace HandBrakeWPF.ViewModels
                 {

                     case 0: // Auto

                         newExtension = this.CurrentTask.RequiresM4v ? ".m4v" : ".mp4";

-                        this.CurrentTask.OutputFormat = newExtension == ".m4v" ? OutputFormat.M4V : OutputFormat.Mp4;

                         break;

                     case 1: // MP4

                         newExtension = ".mp4";

-                        this.CurrentTask.OutputFormat = OutputFormat.Mp4;

                         break;

                     case 2: // M4v

                         newExtension = ".m4v";

-                        this.CurrentTask.OutputFormat = OutputFormat.M4V;

                         break;

                 }

 

-                this.selectedOutputFormat = OutputFormat.Mp4;

                 this.IsMkv = false;

             }

 

@@ -1220,7 +1221,6 @@ namespace HandBrakeWPF.ViewModels
                 this.CurrentTask.OptimizeMP4 = false;

                 this.CurrentTask.IPod5GSupport = false;

                 this.selectedOutputFormat = OutputFormat.Mkv;

-                this.CurrentTask.OutputFormat = OutputFormat.Mkv;

             }

 

             // Update The browse file extension display