nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make sure profilePath exists before loading it.

Browse source 
Cleaning up Action names
Change to development build for user profiles
This commit is contained in:
Lars Brubaker 2016-07-07 17:05:50 -07:00
parent 737955d654
commit 80c3a4708c
4 changed files with 23 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

20
SlicerConfiguration/Settings/ProfileManager.cs
View file

@ -48,12 +48,11 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
private static readonly string userDataPath = DataStorage.ApplicationDataStorage.ApplicationUserDataPath;
internal static readonly string ProfilesPath = Path.Combine(userDataPath, "Profiles");
private static string profilesDBPath
private static string ProfilesDBPath
{
get
{
string username = UserSettings.Instance.get("ActiveUserName");
return Path.Combine(ProfilesPath, string.IsNullOrEmpty(username) ? "profiles.json" : username + ".json");
}
}
@ -85,15 +84,15 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
Directory.CreateDirectory(ProfilesPath);
// Load the profiles.json document
if (File.Exists(profilesDBPath))
if (File.Exists(ProfilesDBPath))
{
Instance = JsonConvert.DeserializeObject<ProfileManager>(File.ReadAllText(profilesDBPath));
Instance = JsonConvert.DeserializeObject<ProfileManager>(File.ReadAllText(ProfilesDBPath));
}
else
{
Instance = new ProfileManager();
if (Path.GetFileName(profilesDBPath) == "profiles.json")
if (Path.GetFileName(ProfilesDBPath) == "profiles.json")
{
// Import classic db based profiles into local json files
DataStorage.ClassicDB.ClassicSqlitePrinterProfiles.ImportPrinters(Instance, ProfilesPath);
@ -179,7 +178,14 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
internal static SettingsProfile LoadProfileFromDisk(string profilePath)
{
return new SettingsProfile(PrinterSettings.LoadFile(profilePath));
if (File.Exists(profilePath))
{
return new SettingsProfile(PrinterSettings.LoadFile(profilePath));
}
else
{
return LoadEmptyProfile();
}
}
internal static void ImportFromExisting(string settingsFilePath)
@ -324,7 +330,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public void Save()
{
File.WriteAllText(profilesDBPath, JsonConvert.SerializeObject(this, Formatting.Indented));
File.WriteAllText(ProfilesDBPath, JsonConvert.SerializeObject(this, Formatting.Indented));
}
}
}