aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS.WinForms
diff options
context:
space:
mode:
authorMichael VanOverbeek <[email protected]>2017-06-10 08:30:08 -0400
committerGitHub <[email protected]>2017-06-10 08:30:08 -0400
commit7dd109719be8a9e8b52655665f490f4f7956df80 (patch)
tree0119a47fb1a7b8e615330a1bb8d0e0c6157b625f /ShiftOS.WinForms
parentebf9b7b253c78cc950a63c4d4e055b71e29dcd4e (diff)
parente5bd035b4c520a2c8d9f398bb1efe72ebc1ccf80 (diff)
downloadshiftos_thereturn-7dd109719be8a9e8b52655665f490f4f7956df80.tar.gz
shiftos_thereturn-7dd109719be8a9e8b52655665f490f4f7956df80.tar.bz2
shiftos_thereturn-7dd109719be8a9e8b52655665f490f4f7956df80.zip
Merge pull request #127 from RogueAI42/master
fix a small bad in ShiftoriumFrontend
Diffstat (limited to 'ShiftOS.WinForms')
-rw-r--r--ShiftOS.WinForms/Applications/ShiftoriumFrontend.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/ShiftOS.WinForms/Applications/ShiftoriumFrontend.cs b/ShiftOS.WinForms/Applications/ShiftoriumFrontend.cs
index 0ae0803..5dfb98e 100644
--- a/ShiftOS.WinForms/Applications/ShiftoriumFrontend.cs
+++ b/ShiftOS.WinForms/Applications/ShiftoriumFrontend.cs
@@ -47,7 +47,7 @@ namespace ShiftOS.WinForms.Applications
public partial class ShiftoriumFrontend : UserControl, IShiftOSWindow
{
public int CategoryId = 0;
- private string[] cats = backend.GetCategories();
+ private string[] cats;
private ShiftoriumUpgrade[] avail;
@@ -94,6 +94,7 @@ namespace ShiftOS.WinForms.Applications
private void Populate()
{
+ cats = Shiftorium.GetCategories();
upgrades = new Dictionary<string, ShiftoriumUpgrade>[cats.Length];
int numComplete = 0;
avail = backend.GetAvailable();