Hesham/OWtrack
1
0
Fork 0
Code Issues 2 Pull Requests Releases 10 Wiki Activity

Merge branch 'release/1.4.3' of Hesham/OWtrack into master

Browse Source
This commit is contained in:
Hesham 2018-12-22 10:14:19 +03:00 committed by HeshamTB
commit d0745d1bec
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OWTrack/MainForm.cs
View File

@ -226,12 +226,16 @@ namespace OWTrack
} }
finally finally
{ {
if (!SRonce) //if (!SRonce)
{ //{
// tr.startSR = sr;
// SRonce = true;
//}
//else tr.newSR = sr;
if (tr.GetCurrentSession().IsNewSession())
tr.startSR = sr; tr.startSR = sr;
SRonce = true; else
} tr.newSR = sr;
else tr.newSR = sr;
} }
AddMatch(); AddMatch();
update(); update();

2
OWTrack/Tracker.cs
View File

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

13
OWTrack/saveManeger.cs
View File

@ -24,7 +24,7 @@ using System.IO;
namespace OWTrack namespace OWTrack
{ {
public static class Paths public struct Paths
{ {
private static string curDir = Directory.GetCurrentDirectory(); private static string curDir = Directory.GetCurrentDirectory();
private static string SAVES = curDir + "/saves/data.json"; private static string SAVES = curDir + "/saves/data.json";
@ -33,14 +33,13 @@ namespace OWTrack
public static string GetSaves() { return SAVES; } public static string GetSaves() { return SAVES; }
public static string GetCurrentDir() { return curDir; } 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 class saveManeger