1.4.0 merge #26

Merged
Hesham merged 17 commits from release/1.4 into master 2018-09-27 10:31:11 +02:00
2 changed files with 12 additions and 19 deletions
Showing only changes of commit 7be0e816f1 - Show all commits

View File

@ -107,12 +107,14 @@ namespace OWTrack
{
MessageBox.Show(e.Message);
}
update();
}
else if (!tr.LoacteOW())
{
tr.gamePath = getGamePath();
}
ExeTrackCheckBx.Checked = tr.TrackOW;
SRCheckBx.Checked = tr.TrackSR;
update();
}
private string getGamePath()
@ -129,20 +131,6 @@ namespace OWTrack
}
else
{
update();
return null;
}
}
private Tracker savedTracker()
{
try
{
return JsonConvert.DeserializeObject<Tracker>(File.ReadAllText(Paths.SAVES));
}
catch (Exception e)
{
MessageBox.Show(e.Message);
return null;
}
}
@ -151,6 +139,7 @@ namespace OWTrack
{
srBut.Enabled = state;
srTextBox.Enabled = state;
tr.TrackSR = state;
}
private void OWTrackFunc(bool state)
@ -243,16 +232,19 @@ namespace OWTrack
private void SRCheckBx_CheckedChanged(object sender, EventArgs e)
{
SRSystem(SRCheckBx.Checked);
update();
}
private void ExeTrackCheckBx_CheckedChanged(object sender, EventArgs e)
{
OWTrackFunc(ExeTrackCheckBx.Checked);
update();
}
private void ChngOWPathBtn_Click(object sender, EventArgs e)
{
tr.gamePath = getGamePath();
update();
}
#endregion

View File

@ -44,6 +44,7 @@ namespace OWTrack
public void setNewSR(int SR) { newSR = SR; }
public int srDiff() { return newSR - startSR; }
public bool TrackOW = true;
public bool TrackSR = true;
public bool owRunning()
{