From 907e73094a2dff49f9b241f764ce85e2c7fd30e3 Mon Sep 17 00:00:00 2001 From: larsbrubaker Date: Mon, 24 Feb 2014 12:30:59 -0800 Subject: [PATCH] Made the mac able to find the static data folder from the solution file. --- DataStorage/Datastore.cs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/DataStorage/Datastore.cs b/DataStorage/Datastore.cs index df80b9406..499b965ee 100644 --- a/DataStorage/Datastore.cs +++ b/DataStorage/Datastore.cs @@ -110,14 +110,18 @@ namespace MatterHackers.MatterControl.DataStorage { return "StaticData"; } - else - { - return Path.Combine(ApplicationPath, "StaticData"); - } + else if(Directory.Exists(Path.Combine(ApplicationPath, "StaticData"))) + { + return Path.Combine(ApplicationPath, "StaticData"); + } + else + { + return Path.Combine("..", "..", "StaticData"); + } default: throw new NotImplementedException(); - } + } } }