Merge for 1.2.4 #8
@ -18,17 +18,18 @@ namespace OWTrack
|
||||
InitializeComponent();
|
||||
loadSave();
|
||||
checkStatus();
|
||||
label4.Text = Program.version.ToString();
|
||||
Text = "OWTrack " + Program.version.ToString();
|
||||
update();
|
||||
label4.Text = Program.Version.ToString();
|
||||
Text = "OWTrack " + Program.Version.ToString();
|
||||
}
|
||||
|
||||
private void checkStatus()
|
||||
{
|
||||
try
|
||||
{
|
||||
Time.Text = DateTime.Now.ToString("h:mm tt");
|
||||
status.Text = NOT_RUNNING;
|
||||
status.ForeColor = Color.Red;
|
||||
try
|
||||
{
|
||||
if (tr.owRunning())
|
||||
{
|
||||
status.Text = IS_RUNNING;
|
||||
@ -75,7 +76,7 @@ namespace OWTrack
|
||||
}
|
||||
}
|
||||
|
||||
void getGamePath()
|
||||
private void getGamePath()
|
||||
{
|
||||
openFileDialog1.Title = "Select Overwatch.exe";
|
||||
openFileDialog1.DefaultExt = "exe";
|
||||
@ -86,7 +87,6 @@ namespace OWTrack
|
||||
if (openFileDialog1.ShowDialog() == DialogResult.OK)
|
||||
{
|
||||
tr.gamePath = openFileDialog1.FileName;
|
||||
MessageBox.Show(openFileDialog1.FileName);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -22,7 +22,7 @@
|
||||
<UpdatePeriodically>false</UpdatePeriodically>
|
||||
<UpdateRequired>false</UpdateRequired>
|
||||
<MapFileExtensions>true</MapFileExtensions>
|
||||
<ApplicationRevision>12</ApplicationRevision>
|
||||
<ApplicationRevision>13</ApplicationRevision>
|
||||
<ApplicationVersion>1.2.3.%2a</ApplicationVersion>
|
||||
<UseApplicationTrust>false</UseApplicationTrust>
|
||||
<PublishWizardCompleted>true</PublishWizardCompleted>
|
||||
|
@ -11,7 +11,6 @@ namespace OWTrack
|
||||
{
|
||||
static class Program
|
||||
{
|
||||
//public static string Version = Application.ProductVersion;
|
||||
/// <summary>
|
||||
/// The main entry point for the application.
|
||||
/// </summary>
|
||||
@ -22,6 +21,10 @@ namespace OWTrack
|
||||
Application.SetCompatibleTextRenderingDefault(false);
|
||||
Application.Run(new Form1());
|
||||
}
|
||||
public static Version version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
|
||||
|
||||
public static string Version = "1.2.3";
|
||||
//public static string Version = Application.ProductVersion;
|
||||
//public static Version version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
|
||||
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user