1 files changed, 5 insertions, 1 deletions
diff --git a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
index e7f76f813..594f2c912 100644
--- a/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
+++ b/win/CS/HandBrakeWPF/Converters/Video/VideoEncoderConverter.cs
@@ -15,8 +15,11 @@ namespace HandBrakeWPF.Converters.Video
     using System.Linq;
     using System.Windows.Data;
 
+    using Caliburn.Micro;
+
     using HandBrake.ApplicationServices.Model;
     using HandBrake.ApplicationServices.Model.Encoding;
+    using HandBrake.ApplicationServices.Services.Interfaces;
     using HandBrake.ApplicationServices.Utilities;
     using HandBrake.Interop.Model.Encoding;
 
@@ -55,7 +58,8 @@ namespace HandBrakeWPF.Converters.Video
                     encoders.Remove(VideoEncoder.Theora);
                 }
 
-                if (!SystemInfo.IsQsvAvailable)
+                IUserSettingService userSettingService = IoC.Get<IUserSettingService>();
+                if (!SystemInfo.IsQsvAvailable || !userSettingService.GetUserSetting<bool>(UserSettingConstants.EnableQuickSync))
                 {
                     encoders.Remove(VideoEncoder.QuickSync);
                 }