WinGui: Move Handling of AutoPassthru to the UI so it more clearly reflects what is happening and allows correct processing of fallback encoder values. Fixes #2619

1 files changed, 7 insertions, 1 deletions

diff --git a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs
index 4ad2cd11d..458d60ece 100644
--- a/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs
+++ b/win/CS/HandBrakeWPF/Services/Encode/Model/Models/AudioTrack.cs
@@ -130,9 +130,15 @@ namespace HandBrakeWPF.Services.Encode.Model.Models
             if (track.IsPassthru && (sourceTrack.Codec & encoderInfo.Id) == 0)
             {
                 chosenEncoder = fallback;
-                encoderInfo = HandBrakeEncoderHelpers.GetAudioEncoder(EnumHelper<AudioEncoder>.GetShortName(track.Encoder));
             }
 
+            if (track.IsPassthru && chosenEncoder == AudioEncoder.Passthrough)
+            {
+                chosenEncoder = fallback;
+            }
+
+            encoderInfo = HandBrakeEncoderHelpers.GetAudioEncoder(EnumHelper<AudioEncoder>.GetShortName(chosenEncoder));
+
             this.scannedTrack = sourceTrack;
             this.drc = track.DRC;
             this.encoder = chosenEncoder;