Permalink
Browse files

Upgrade path cleanup

  • Loading branch information...
thezerothcat committed Apr 15, 2018
1 parent 5291794 commit a37268f5a55601abb06b1a89a2d5d028e2282c0c
Showing with 23 additions and 3 deletions.
  1. +22 −1 LaMulanaItemTrackerForm.cs
  2. +1 −1 Properties/AssemblyInfo.cs
  3. +0 −1 names.xml
View
@@ -388,7 +388,19 @@ private void flagListener_DoWork(object sender, DoWorkEventArgs e)
// to the Result property of the DoWorkEventArgs
// object. This is will be available to the
// RunWorkerCompleted eventhandler.
e.Result = LMRItemTracker.Program.DoStuff(this, this._xmlStream);
try
{
e.Result = LMRItemTracker.Program.DoStuff(this, this._xmlStream);
}
catch (Exception ex)
{
ShowMessage("Unexpected error: " + ex.Message);
}
}
public void ShowMessage(string message)
{
MessageBox.Show(message);
}
private String getItemName(String flagName)
@@ -1684,6 +1696,14 @@ private void LaMulanaItemTrackerForm_Load(object sender, EventArgs e)
{
Properties.Settings.Default.Upgrade();
Properties.Settings.Default.UpgradeRequired = false;
// Upgrade settings from 1.0.11 where item names were different.
Properties.Settings.Default.Panel1Contents = Properties.Settings.Default.Panel1Contents.Replace("Hermes Boots", "Hermes' Boots").Replace("Glyph Reader", "reader.exe");
Properties.Settings.Default.Panel2Contents = Properties.Settings.Default.Panel2Contents.Replace("Hermes Boots", "Hermes' Boots").Replace("Glyph Reader", "reader.exe");
Properties.Settings.Default.Panel3Contents = Properties.Settings.Default.Panel3Contents.Replace("Hermes Boots", "Hermes' Boots").Replace("Glyph Reader", "reader.exe");
Properties.Settings.Default.Panel4Contents = Properties.Settings.Default.Panel4Contents.Replace("Hermes Boots", "Hermes' Boots").Replace("Glyph Reader", "reader.exe");
Properties.Settings.Default.Panel5Contents = Properties.Settings.Default.Panel5Contents.Replace("Hermes Boots", "Hermes' Boots").Replace("Glyph Reader", "reader.exe");
Properties.Settings.Default.Panel6Contents = Properties.Settings.Default.Panel6Contents.Replace("Hermes Boots", "Hermes' Boots").Replace("Glyph Reader", "reader.exe");
Properties.Settings.Default.Save();
updateAlwaysOnTop();
@@ -1702,6 +1722,7 @@ private void LaMulanaItemTrackerForm_Load(object sender, EventArgs e)
readerPanel.Size = new System.Drawing.Size(40, 40);
}
InitializeFormPanels();
}
@@ -32,4 +32,4 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.1.0")]
[assembly: AssemblyVersion("1.0.12")]
View
@@ -208,5 +208,4 @@
<item id="word-073" value="ammo-mystery-73" />
<item id="word-074" value="ammo-bullet" />
<item id="flags-1" value="death-tracker" />
<item id="byte-27b" value="flail-puzzle" />
</items>

0 comments on commit a37268f

Please sign in to comment.