From 31485deb3da5a10c70ddd197bc4188411f2d64ff Mon Sep 17 00:00:00 2001 From: larsbrubaker Date: Thu, 6 Nov 2014 11:27:42 -0800 Subject: [PATCH] Fixed a problem with eeprom settings loading from the printer thread rather than the uithread. --- EeProm/EePromMarlinSettings.cs | 11 ++++++++++- EeProm/EePromMarlinWidget.cs | 2 -- StaticData/Translations/Master.txt | 6 ++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/EeProm/EePromMarlinSettings.cs b/EeProm/EePromMarlinSettings.cs index 59f8ae76e..00479cfcc 100644 --- a/EeProm/EePromMarlinSettings.cs +++ b/EeProm/EePromMarlinSettings.cs @@ -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() { diff --git a/EeProm/EePromMarlinWidget.cs b/EeProm/EePromMarlinWidget.cs index 4b6da4083..90aba7bd3 100644 --- a/EeProm/EePromMarlinWidget.cs +++ b/EeProm/EePromMarlinWidget.cs @@ -182,8 +182,6 @@ namespace MatterHackers.MatterControl.EeProm PrinterConnectionAndCommunication.Instance.CommunicationUnconditionalFromPrinter.RegisterEvent(currentEePromSettings.Add, ref unregisterEvents); - currentEePromSettings.eventAdded += SetUiToPrinterSettings; - AddChild(mainContainer); ShowAsSystemWindow(); diff --git a/StaticData/Translations/Master.txt b/StaticData/Translations/Master.txt index 6edfbe979..1488b3e26 100644 --- a/StaticData/Translations/Master.txt +++ b/StaticData/Translations/Master.txt @@ -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 +