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

Fixed a problem with eeprom settings loading from the printer thread rather than the uithread.

Browse source
This commit is contained in:
larsbrubaker 2014-11-06 11:27:42 -08:00
parent 6149c9177d
commit 31485deb3d
3 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
EeProm/EePromMarlinSettings.cs
View file

@ -415,10 +415,19 @@ namespace MatterHackers.MatterControl.EeProm
{
if (eventAdded != null)
{
eventAdded(this, lineString);
UiThread.RunOnIdle(CallEventAdded, lineString);
}
}
}
void CallEventAdded(object state)
{
StringEventArgs lineString = state as StringEventArgs;
if (lineString != null)
{
eventAdded(this, lineString);
}
}
public void Update()
{

2
EeProm/EePromMarlinWidget.cs
View file

@ -182,8 +182,6 @@ namespace MatterHackers.MatterControl.EeProm
PrinterConnectionAndCommunication.Instance.CommunicationUnconditionalFromPrinter.RegisterEvent(currentEePromSettings.Add, ref unregisterEvents);
currentEePromSettings.eventAdded += SetUiToPrinterSettings;
AddChild(mainContainer);
ShowAsSystemWindow();

6
StaticData/Translations/Master.txt
View file

@ -2837,3 +2837,9 @@ Translated:If greater than 0, this is the distance away from parts to create a p
English:Please Confirm
Translated:Please Confirm
English:Reset to Factory Defaults
Translated:Reset to Factory Defaults
English:Save to EEProm
Translated:Save to EEProm