Skip to content

Commit 2b49672

Browse files
authored
Version 1.7.5.3
1 parent ce5a9bb commit 2b49672

14 files changed

+7715
-5030
lines changed

GRBL-Plotter/GUI/MainForm.Designer.cs

Lines changed: 33 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

GRBL-Plotter/GUI/MainForm.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ public partial class MainForm : Form
109109
private ulong mainTimerCount = 0;
110110

111111
private bool showFormInFront = false;
112+
private bool shutDown = false;
112113

113114
// Trace, Debug, Info, Warn, Error, Fatal
114115
private static readonly NLog.Logger Logger = NLog.LogManager.GetCurrentClassLogger();
@@ -322,6 +323,7 @@ private void SplashScreenTimer_Tick(object sender, EventArgs e)
322323
// close Main form
323324
private void MainForm_FormClosing(object sender, FormClosingEventArgs e)
324325
{ // Note all other forms will be closed, before reaching following code...
326+
shutDown = true;
325327
Logger.Info("###### FormClosing ");
326328
if (isStreaming)
327329
EventCollector.SetStreaming("CLOST");
@@ -448,6 +450,8 @@ private void ShowLaserMode()
448450
// update 500ms
449451
private void MainTimer_Tick(object sender, EventArgs e)
450452
{
453+
if (shutDown) { return; }
454+
451455
if (timerUpdateControls) // streaming reset, finish, pause, toolchange, stop
452456
{
453457
timerUpdateControls = false;
@@ -616,8 +620,6 @@ private void MainTimer_Tick(object sender, EventArgs e)
616620
{
617621
if (!CloseMessageForm(true))
618622
delayedMessageFormClose++;
619-
620-
// Logger.Trace("delayedMessageFormClose {0}", delayedMessageFormClose);
621623
}
622624
}
623625
if (delayedHeightMapShow > 0)
@@ -1329,8 +1331,8 @@ private void ProcessCommands(string command)
13291331
}
13301332
else
13311333
{
1332-
_serial_form.AddToLog("Script/file does not exists: " + command);
1333-
Logger.Warn("ProcessCommands Script/file does not exists: {0}", command);
1334+
_serial_form.AddToLog("Script/file does not exists: " + Path.GetFullPath(command));
1335+
Logger.Warn("ProcessCommands Script/file does not exists: {0} {1}", command, Path.GetFullPath(command));
13341336
}
13351337
}
13361338
else

0 commit comments

Comments
 (0)