1 files changed, 10 insertions, 2 deletions
diff --git a/win/C#/Functions/QueryGenerator.cs b/win/C#/Functions/QueryGenerator.cs
index a91a058c2..adb2199bc 100644
--- a/win/C#/Functions/QueryGenerator.cs
+++ b/win/C#/Functions/QueryGenerator.cs
@@ -340,8 +340,16 @@ namespace Handbrake.Functions
             if (mainWindow.drp_videoFramerate.Text != "Same as source")
                 query += " -r " + mainWindow.drp_videoFramerate.Text;
 
-            if (mainWindow.checkMaximumFramerate.Checked)
-                query += " --pfr ";
+            if (mainWindow.drp_videoFramerate.SelectedIndex == 0)
+            {
+                // If we use Same as Source, we can either output CFR or VFR
+                query += mainWindow.radio_constantFramerate.Checked ? " --cfr " : " --vfr ";
+            } 
+            else
+            {
+                // We have a hard framerate set, so we can either be Constant or peak (VFR) framerate
+                query += mainWindow.radio_constantFramerate.Checked ? " --cfr " : " --pfr ";
+            }
 
             return query;
         }