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

Add locking around file save operations

Browse source
This commit is contained in:
John Lewin 2016-08-30 10:41:38 -07:00
parent faf97d9659
commit 98c26d0a7c
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
SlicerConfiguration/Settings/PrinterSettings.cs
View file

@ -66,6 +66,8 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public static Func<bool> ShouldShowAuthPanel { get; set; }
private static object writeLock = new object();
[JsonIgnore]
internal PrinterSettingsLayer QualityLayer { get; private set; }
@ -204,7 +206,10 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
}
}
File.WriteAllText(DocumentPath, json);
lock (writeLock)
{
File.WriteAllText(DocumentPath, json);
}
if (ActiveSliceSettings.Instance.ID == this.ID)
{

8
SlicerConfiguration/Settings/ProfileManager.cs
View file

@ -53,6 +53,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public const string ProfileExtension = ".printer";
private static object writeLock = new object();
private static EventHandler unregisterEvents;
private static readonly string userDataPath = ApplicationDataStorage.ApplicationUserDataPath;
private static string ProfilesPath
@ -80,7 +81,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
{
get
{
string username = UserSettings.Instance.get("ActiveUserName");
if (string.IsNullOrEmpty(username))
@ -100,7 +100,6 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
}
return username;
}
}
static ProfileManager()
@ -524,7 +523,10 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
public void Save()
{
File.WriteAllText(ProfilesDBPath, JsonConvert.SerializeObject(this, Formatting.Indented));
lock(writeLock)
{
File.WriteAllText(ProfilesDBPath, JsonConvert.SerializeObject(this, Formatting.Indented));
}
}
}
}