1.3 Merge #17

Merged
Hesham merged 11 commits from Dev into master 2018-09-04 20:01:39 +02:00
Showing only changes of commit d152a05e48 - Show all commits

View File

@ -4,6 +4,7 @@ using System.Windows.Forms;
using Newtonsoft.Json; using Newtonsoft.Json;
using System.IO; using System.IO;
namespace OWTrack namespace OWTrack
{ {
public partial class Form1 : Form public partial class Form1 : Form
@ -21,6 +22,7 @@ namespace OWTrack
update(); update();
label4.Text = Program.Version.ToString(); label4.Text = Program.Version.ToString();
Text = "OWTrack " + Program.Version.ToString(); Text = "OWTrack " + Program.Version.ToString();
} }
private void checkStatus() private void checkStatus()
@ -73,8 +75,8 @@ namespace OWTrack
{ {
if (!tr.LoacteOW()) if (!tr.LoacteOW())
{ {
getGamePath();
st.Close(); st.Close();
getGamePath();
} }
return true; return true;
} }
@ -104,11 +106,17 @@ namespace OWTrack
openFileDialog1.CheckFileExists = true; openFileDialog1.CheckFileExists = true;
openFileDialog1.CheckPathExists = true; openFileDialog1.CheckPathExists = true;
if (openFileDialog1.ShowDialog() == DialogResult.OK) DialogResult result = openFileDialog1.ShowDialog();
if (result == DialogResult.OK)
{ {
tr.gamePath = openFileDialog1.FileName; tr.gamePath = openFileDialog1.FileName;
update();
} }
else if (result == DialogResult.Cancel)
{
Close();
}
update();
} }
private Tracker savedTracker() private Tracker savedTracker()