cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-25 05:56:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #208 from Cyberboss/VersionDetectionFix

Browse Source 
Fixes installer not calling PrepareForUpdate on versions < 3.1
This commit is contained in:
Jordan Brown
2017-09-24 09:50:21 -04:00
committed by GitHub
parent b4e661bf65 44347836b4
commit db959b2ba5
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TGInstallerWrapper/Main.cs
+20 -19
View File
@@ -21,15 +21,16 @@ namespace TGInstallerWrapper
InitializeComponent();
FormClosing += Main_FormClosing;
PathTextBox.Text = Environment.GetFolderPath(Environment.SpecialFolder.ProgramFilesX86) + Path.DirectorySeparatorChar + InstallDir;
if (Server.VerifyConnection() == null)
try
{
VersionLabel.Text = Server.GetComponent<ITGSService>().Version();
}
catch
{
var verifiedConnection = Server.VerifyConnection() == null;
try
{
VersionLabel.Text = Server.GetComponent<ITGSService>().Version();
}
catch
{
if(verifiedConnection)
VersionLabel.Text = "< v3.0.85.0 (Missing ITGService.Version())";
}
}
TargetVersionLabel.Text += " v" + FileVersionInfo.GetVersionInfo(System.Reflection.Assembly.GetExecutingAssembly().Location).FileVersion;
}
@@ -110,17 +111,17 @@ namespace TGInstallerWrapper
ProgressBar.Style = ProgressBarStyle.Marquee;
if (Server.VerifyConnection() == null)
try
{
Server.GetComponent<ITGSService>().PrepareForUpdate();
Thread.Sleep(3000); //chat messages
}
catch
{
if (MessageBox.Show("ITGSService.PrepareForUpdate() threw an exception! Existing DreamDaemon instances will be terminated. Continue?", "Warning", MessageBoxButtons.YesNo) != DialogResult.Yes)
return;
}
var connectionVerified = Server.VerifyConnection() == null;
try
{
Server.GetComponent<ITGSService>().PrepareForUpdate();
Thread.Sleep(3000); //chat messages
}
catch
{
if (connectionVerified && MessageBox.Show("ITGSService.PrepareForUpdate() threw an exception! Existing DreamDaemon instances will be terminated. Continue?", "Warning", MessageBoxButtons.YesNo) != DialogResult.Yes)
return;
}
InstallCancelButton.Enabled = true;