Merge branch 'Redo-SR' into release/1.4.3

OWTrack/MainForm.cs

@@ -86,7 +86,16 @@ namespace OWTrack
             {
                 try
                 {
-                    tr = saveManeger.GetSavedTracker();
+                    try
+                    {
+                        tr = saveManeger.GetSavedTracker();
+                    }
+                    catch (Exception)
+                    {
+                        MessageBox.Show("Could not load Save.\n" +
+                                        "Starting new save.");
+                        tr = new Tracker();
+                    }
                     if (tr.startSR > 0) SRonce = true;
                     if (tr.settings.GamePath == "" || tr.settings.GamePath == null)
                     {
@@ -217,12 +226,16 @@ namespace OWTrack
             }
             finally
             {
-                if (!SRonce)
+                //if (!SRonce)
-                {
+                //{
+                //    tr.startSR = sr;
+                //    SRonce = true;
+                //}
+                //else tr.newSR = sr;
+                if (tr.GetCurrentSession().IsNewSession())
                     tr.startSR = sr;
-                    SRonce = true;
+                else
-                }
+                    tr.newSR = sr;
-                else tr.newSR = sr;
             }
             AddMatch();
             update();

OWTrack/Tracker.cs

@@ -71,7 +71,6 @@ namespace OWTrack
         {
             Session ses = new Session(startSR);
             sessions.Add(ses);
-            //Re do SR input!! 
         }
 
         public Session GetCurrentSession()
@@ -216,6 +215,7 @@ namespace OWTrack
         public Match() { }
         public DateTime dateTime { get; set; }
         public int StartSR;
+        public int LastMatchSR;
         public int newSR;
         public int ChangeInSR;
     }

OWTrack/saveManeger.cs

@@ -24,7 +24,7 @@ using System.IO;
 
 namespace OWTrack
 {
-    public static class Paths
+    public struct Paths
     {
         private static string curDir = Directory.GetCurrentDirectory();
         private static string SAVES = curDir + "/saves/data.json";
@@ -33,14 +33,13 @@ namespace OWTrack
         public static string GetSaves() { return SAVES; }
         public static string GetCurrentDir() { return curDir; }
 
-        public static class ProgramFiles
+        public struct ProgramFiles
         {
-            public static readonly string C = "C:\\Program Files";
+            public const string C = "C:\\Program Files";
-            public static readonly string D = "D:\\Program Files";
+            public const string D = "D:\\Program Files";
-            public static readonly string E = "E:\\Program Files";
+            public const string E = "E:\\Program Files";
-            public static readonly string F = "F:\\Program Files";
+            public const string F = "F:\\Program Files";
         }
-
     }
 
     class saveManeger
@@ -55,9 +54,10 @@ namespace OWTrack
             {
                 return JsonConvert.DeserializeObject<Tracker>(File.ReadAllText(Paths.GetSaves()));
             }
-            catch (Exception e)
+            catch (Exception)
             {
-                throw e;
+                Exception ex = new Exception("json");
+                throw ex;
             }
         }