From f46fcbfbd4c5eb9bcad7a447888dad566711887b Mon Sep 17 00:00:00 2001
From: Vincent Maas <vinniem@outlook.com>
Date: Thu, 26 Nov 2020 21:43:52 +0100
Subject: [PATCH] fix exception logging

---
 ColorControl.sln                        | 2 --
 ColorControl/ColorControl.csproj        | 2 +-
 ColorControl/ExceptionExtensions.cs     | 7 +++++--
 ColorControl/Properties/AssemblyInfo.cs | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ColorControl.sln b/ColorControl.sln
index 2b1aff5..c62f64f 100644
--- a/ColorControl.sln
+++ b/ColorControl.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 16.0.30128.74
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ColorControl", "ColorControl\ColorControl.csproj", "{A6005D08-70F0-44CB-A384-9219EBA84F21}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0373E1EF-1DE6-4BCB-BC95-2D7961DBA194}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
diff --git a/ColorControl/ColorControl.csproj b/ColorControl/ColorControl.csproj
index 91a50ad..538a8ba 100644
--- a/ColorControl/ColorControl.csproj
+++ b/ColorControl/ColorControl.csproj
@@ -27,7 +27,7 @@
     <ProductName>ColorControl</ProductName>
     <PublisherName>Maassoft</PublisherName>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.3.3.0</ApplicationVersion>
+    <ApplicationVersion>1.3.4.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
diff --git a/ColorControl/ExceptionExtensions.cs b/ColorControl/ExceptionExtensions.cs
index 4ad20dc..ca1aa7d 100644
--- a/ColorControl/ExceptionExtensions.cs
+++ b/ColorControl/ExceptionExtensions.cs
@@ -19,7 +19,10 @@ namespace ColorControl
         public static string ToLogString(this Exception exception, string environmentStackTrace = "")
         {
             List<string> environmentStackTraceLines = ExceptionExtensions.GetUserStackTraceLines(environmentStackTrace);
-            environmentStackTraceLines.RemoveAt(0);
+            if (environmentStackTraceLines.Any())
+            {
+                environmentStackTraceLines.RemoveAt(0);
+            }
 
             List<string> stackTraceLines = ExceptionExtensions.GetStackTraceLines(exception.StackTrace);
             stackTraceLines.AddRange(environmentStackTraceLines);
@@ -46,7 +49,7 @@ namespace ColorControl
         private static List<string> GetUserStackTraceLines(string fullStackTrace)
         {
             List<string> outputList = new List<string>();
-            Regex regex = new Regex(@"([^\)]*\)) in (.*):line (\d)*$");
+            Regex regex = new Regex(@"([^\)]*\)) in (.*):([A-z]*) (\d)*$");
 
             List<string> stackTraceLines = ExceptionExtensions.GetStackTraceLines(fullStackTrace);
             foreach (string stackTraceLine in stackTraceLines)
diff --git a/ColorControl/Properties/AssemblyInfo.cs b/ColorControl/Properties/AssemblyInfo.cs
index cf7ede5..4226cd1 100644
--- a/ColorControl/Properties/AssemblyInfo.cs
+++ b/ColorControl/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.3.0")]
-[assembly: AssemblyFileVersion("1.3.3.0")]
+[assembly: AssemblyVersion("1.3.4.0")]
+[assembly: AssemblyFileVersion("1.3.4.0")]