aboutsummaryrefslogtreecommitdiff
path: root/ShiftOS.WinForms
diff options
context:
space:
mode:
authorMichael <[email protected]>2017-02-09 19:00:26 -0500
committerMichael <[email protected]>2017-02-09 19:00:26 -0500
commitd6b2b155264e7a4b576c956530915f66d97b3eac (patch)
tree1f4fde3c20517f1476960b6fbb7a4eba30734753 /ShiftOS.WinForms
parentf0b7634d5204aee61a361e2cafb911b33d995f56 (diff)
downloadshiftos_thereturn-d6b2b155264e7a4b576c956530915f66d97b3eac.tar.gz
shiftos_thereturn-d6b2b155264e7a4b576c956530915f66d97b3eac.tar.bz2
shiftos_thereturn-d6b2b155264e7a4b576c956530915f66d97b3eac.zip
Fix JSON parse bug with shop listing
Diffstat (limited to 'ShiftOS.WinForms')
-rw-r--r--ShiftOS.WinForms/Applications/MUDControlCentre.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/ShiftOS.WinForms/Applications/MUDControlCentre.cs b/ShiftOS.WinForms/Applications/MUDControlCentre.cs
index 927f50d..67c6c17 100644
--- a/ShiftOS.WinForms/Applications/MUDControlCentre.cs
+++ b/ShiftOS.WinForms/Applications/MUDControlCentre.cs
@@ -145,7 +145,7 @@ namespace ShiftOS.WinForms.Applications
var contents = JsonConvert.DeserializeObject<Dictionary<string, object>>(msg.Contents);
if((string)contents["shop"] == CurrentShop.Name)
{
- CurrentShop.Items.Add((ShopItem)contents["itemdata"]);
+ CurrentShop.Items.Add(JsonConvert.DeserializeObject<ShopItem>(JsonConvert.SerializeObject(contents["itemdata"])));
this.Invoke(new Action(PopulateShopView));
}
}