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

Fix post-rebase errors

Browse source
This commit is contained in:
John Lewin 2018-11-09 12:04:56 -08:00
parent 991a9896ed
commit 704d4c1d7b
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
MatterControlLib/ApplicationView/ApplicationController.cs
View file

@ -1399,16 +1399,15 @@ namespace MatterHackers.MatterControl
}
}
public void Connection_ErrorReported(object sender, EventArgs e)
public void Connection_ErrorReported(object sender, string line)
{
var foundStringEventArgs = e as FoundStringEventArgs;
if (foundStringEventArgs != null)
if (line != null)
{
string message = "Your printer is reporting a HARDWARE ERROR and has been paused. Check the error and cancel the print if required.".Localize()
+ "\n"
+ "\n"
+ "Error Reported".Localize() + ":"
+ $" \"{foundStringEventArgs.LineToCheck}\".";
+ $" \"{line}\".";
UiThread.RunOnIdle(() =>
StyledMessageBox.ShowMessageBox((clickedOk) =>
{