1.4.3 #38

Merged
Hesham merged 25 commits from release/1.4.3 into master 2018-12-21 22:19:53 +01:00
2 changed files with 16 additions and 16 deletions
Showing only changes of commit a28e09de89 - Show all commits

View File

@ -44,9 +44,9 @@ namespace OWTrack
label4.Text = Version; label4.Text = Version;
Text = "OWTrack " + Version; Text = "OWTrack " + Version;
} }
private void checkStatus() private void checkStatus()
{ {
Time.Text = DateTime.Now.ToString("h:mm tt"); Time.Text = DateTime.Now.ToString("h:mm tt");
try try
{ {
@ -88,20 +88,20 @@ namespace OWTrack
{ {
try try
{ {
tr = saveManeger.GetSavedTracker(); tr = saveManeger.GetSavedTracker();
if (tr.startSR > 0) SRonce = true; if (tr.startSR > 0) SRonce = true;
if (tr.settings.GamePath == "" || tr.settings.GamePath == null) if (tr.settings.GamePath == "" || tr.settings.GamePath == null)
{ {
if (!tr.LoacteOW()) if (!tr.LoacteOW())
{ {
tr.settings.GamePath = askForGamePath(); tr.settings.GamePath = askForGamePath();
} }
} }
} }
catch (Exception e) catch (Exception e)
{ {
MessageBox.Show(e.Message); MessageBox.Show(e.Message);
} }
} }
else if (!tr.LoacteOW()) else if (!tr.LoacteOW())
{ {
@ -115,15 +115,15 @@ namespace OWTrack
{ {
openFileDialog1.Title = "Select Overwatch.exe"; openFileDialog1.Title = "Select Overwatch.exe";
openFileDialog1.DefaultExt = "exe"; openFileDialog1.DefaultExt = "exe";
openFileDialog1.Filter = "exe Files (*.exe)|*.exe|All files (*.*)|*.*"; openFileDialog1.Filter = "exe Files (*.exe)|*.exe|All files (*.*)|*.*";
DialogResult result = openFileDialog1.ShowDialog(); DialogResult result = openFileDialog1.ShowDialog();
if (result == DialogResult.OK) if (result == DialogResult.OK)
{ {
MessageBox.Show("Saved Overwatch.exe location.\nPress Clear to rest"); MessageBox.Show("Saved Overwatch.exe location.\nPress Clear to rest");
return openFileDialog1.FileName; return openFileDialog1.FileName;
} }
else return null; else return null;
} }
private void SRSystem(bool state) private void SRSystem(bool state)
{ {
@ -191,13 +191,13 @@ namespace OWTrack
tr.rediceLoss(); tr.rediceLoss();
update(); update();
} }
} }
private void clearBut_Click(object sender, EventArgs e) private void clearBut_Click(object sender, EventArgs e)
{ {
tr.reset(); tr.reset();
update(); update();
} }
private void srBut_Click(object sender, EventArgs e) private void srBut_Click(object sender, EventArgs e)
{ {
@ -250,7 +250,7 @@ namespace OWTrack
private void MainForm_FormClosing(object sender, FormClosingEventArgs e) private void MainForm_FormClosing(object sender, FormClosingEventArgs e)
{ {
notifyIcon1.Icon = null; notifyIcon1.Icon = null;
notifyIcon1.Dispose(); notifyIcon1.Dispose();
} }
#endregion #endregion
} }

View File

@ -44,7 +44,7 @@ namespace OWTrack
} }
class saveManeger class saveManeger
{ {
/// <summary> /// <summary>
/// Deserialize saved tracker instance. /// Deserialize saved tracker instance.
/// </summary> /// </summary>
@ -86,7 +86,7 @@ namespace OWTrack
public static bool SaveJSON(Tracker tracker) public static bool SaveJSON(Tracker tracker)
{ {
try try
{ {
File.WriteAllText(Paths.GetSaves(), JsonConvert.SerializeObject(tracker, Formatting.Indented)); File.WriteAllText(Paths.GetSaves(), JsonConvert.SerializeObject(tracker, Formatting.Indented));
return true; return true;
} }