Fix issue when switching betweeen old and new headless mode

Sicos1977 · Oct 16, 2023 · 283e770 · 283e770
1 parent a4a8664
commit 283e770
Showing 1 changed file with 21 additions and 17 deletions.
diff --git a/ChromiumHtmlToPdfLib/Converter.cs b/ChromiumHtmlToPdfLib/Converter.cs
@@ -527,7 +527,19 @@ private DocumentHelper GetDocumentHelper
     /// <remarks>
     ///     https://developer.chrome.com/articles/new-headless/
     /// </remarks>
-    public bool UseOldHeadlessMode { get; set; }
+    public bool UseOldHeadlessMode
+    {
+        get => !_defaultChromiumArgument.Contains("--headless=new");
+        set
+        {
+            for (var i = 0; i < _defaultChromiumArgument.Count; i++)
+            {
+                if (!_defaultChromiumArgument[i].StartsWith("--headless")) continue;
+                _defaultChromiumArgument[i] = value ? "--headless" : "--headless=new";
+                return;
+            }
+        }
+    }
     #endregion
 
     #region Constructor
@@ -854,11 +866,7 @@ public void ResetChromiumArguments()
 
         _defaultChromiumArgument = new List<string>();
 
-        if (UseOldHeadlessMode)
-            AddChromiumArgument("--headless");
-        else
-            AddChromiumArgument("--headless", "new");
-
+        AddChromiumArgument("--headless=new");
         AddChromiumArgument("--disable-gpu");
         AddChromiumArgument("--hide-scrollbars");
         AddChromiumArgument("--mute-audio");
@@ -896,11 +904,11 @@ public void RemoveChromiumArgument(string argument)
         if (string.IsNullOrWhiteSpace(argument))
             throw new ArgumentException("Argument is null, empty or white space");
 
+        if (argument.StartsWith("--headless"))
+            throw new ArgumentException("Can't remove '--headless' argument, this argument is always needed");
+
         switch (argument)
         {
-            case "--headless":
-                throw new ArgumentException("Can't remove '--headless' argument, this argument is always needed");
-
             case "--no-first-run":
                 throw new ArgumentException("Can't remove '--no-first-run' argument, this argument is always needed");
 
@@ -909,11 +917,9 @@ public void RemoveChromiumArgument(string argument)
                     "Can't remove '---remote-debugging-port=\"0\"' argument, this argument is always needed");
         }
 
-        if (_defaultChromiumArgument.Contains(argument))
-        {
-            _defaultChromiumArgument.Remove(argument);
-            WriteToLog($"Removed Chromium argument '{argument}'");
-        }
+        if (!_defaultChromiumArgument.Contains(argument)) return;
+        _defaultChromiumArgument.Remove(argument);
+        WriteToLog($"Removed Chromium argument '{argument}'");
     }
     #endregion
 
@@ -942,9 +948,7 @@ public void AddChromiumArgument(string argument)
             _defaultChromiumArgument.Add(argument);
         }
         else
-        {
             WriteToLog($"The Chromium argument '{argument}' has already been set, ignoring it");
-        }
     }
 
     /// <summary>
@@ -967,7 +971,7 @@ public void AddChromiumArgument(string argument, string value)
         if (string.IsNullOrWhiteSpace(argument))
             throw new ArgumentException("Argument is null, empty or white space");
 
-        for (var i = 0; i < DefaultChromiumArguments.Count; i++)
+        for (var i = 0; i < _defaultChromiumArgument.Count; i++)
         {
             if (!_defaultChromiumArgument[i].StartsWith(argument + "=")) continue;