Merge branch 'fix-nongeneric-has-header' of github.com:Rob-Hague/CsvH…

…elper into Rob-Hague-fix-nongeneric-has-header

src/CsvHelper/CsvWriter.cs

@@ -803,16 +803,20 @@ private bool WriteHeader<T>(IEnumerable<T> records)
 
 		private bool WriteHeader(IEnumerable records)
 		{
-			object record = null;
+			if (!hasHeaderRecord || hasHeaderBeenWritten)
+			{
+				return false;
+			}
+
 			foreach (var r in records)
 			{
 				if (r != null)
 				{
-					record = r;
+					return WriteHeader(r);
 				}
 			}
 
-			return WriteHeader(record);
+			return false;
 		}
 
 		private bool WriteHeader(object record)

tests/CsvHelper.Tests/CsvWriterTests.cs

@@ -13,6 +13,7 @@
 using System.Dynamic;
 using Xunit;
 using System.Threading;
+using System.Collections;
 
 namespace CsvHelper.Tests
 {
@@ -835,6 +836,37 @@ public void WriteInternalConstructorClassTest()
 			}
 		}
 
+		[Theory]
+		[InlineData(false)]
+		[InlineData(true)]
+		public void WriteRecords_NonGeneric_HasHeaderRecord(bool hasHeaderRecord)
+		{
+			var confg = new CsvConfiguration(CultureInfo.InvariantCulture)
+			{
+				HasHeaderRecord = hasHeaderRecord
+			};
+
+			using var stringWriter = new StringWriter();
+			using var csvWriter = new CsvWriter(stringWriter, confg);
+
+			IEnumerable records = new object[] {
+				new TestSinglePropertyRecord { Name = "test" },
+				new TestRecord { IntColumn = 4 }
+			};
+
+			csvWriter.WriteRecords(records);
+			var csv = stringWriter.ToString();
+
+			if (hasHeaderRecord)
+			{
+				Assert.Equal("Name\r\ntest\r\n4,,,,\r\n", csv);
+			}
+			else
+			{
+				Assert.Equal("test\r\n4,,,,\r\n", csv);
+			}
+		}
+
 		private class GetOnly
 		{
 			internal GetOnly(string someParam)