Merge branch '1.5.2'

Conflicts:
	ApplicationView/MenuRow/MenuOptionSettings.cs
	StaticData/Translations/Master.txt
This commit is contained in:
Lars Brubaker 2016-04-14 15:42:42 -07:00
commit 4bb141339e
8 changed files with 144 additions and 112 deletions

View file

@ -146,7 +146,10 @@ namespace MatterHackers.MatterControl.PrintHistory
{
UiThread.RunOnIdle(() =>
{
LoadHistoryItems(Count);
if(!this.WidgetHasBeenClosed)
{
LoadHistoryItems(Count);
}
});
}