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

Fixed regression where we turned off sd card printing temps.

Browse source 
Wrote regression test for cancel print code
Made the emulator able to simulate sd card files
This commit is contained in:
Lars Brubaker 2017-03-07 17:52:44 -08:00
parent def442958b
commit 5218a82783
5 changed files with 249 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

12
MatterControlApplication.cs
View file

@ -614,7 +614,7 @@ namespace MatterHackers.MatterControl
//Save a snapshot of the prints in queue
QueueData.Instance.SaveDefaultQueue();
if (PrinterConnectionAndCommunication.Instance.PrinterIsPrinting)
if (!closeHasBeenConfirmed && PrinterConnectionAndCommunication.Instance.PrinterIsPrinting)
{
if (PrinterConnectionAndCommunication.Instance.CommunicationState != PrinterConnectionAndCommunication.CommunicationStates.PrintingFromSd)
{
@ -648,11 +648,19 @@ namespace MatterHackers.MatterControl
}
}
bool closeHasBeenConfirmed = false;
private void ConditionalyCloseNow(bool continueWithShutdown)
{
if (continueWithShutdown)
{
PrinterConnectionAndCommunication.Instance.Disable();
closeHasBeenConfirmed = true;
bool printingFromSdCard = PrinterConnectionAndCommunication.Instance.CommunicationState == PrinterConnectionAndCommunication.CommunicationStates.PrintingFromSd
|| (PrinterConnectionAndCommunication.Instance.CommunicationState == PrinterConnectionAndCommunication.CommunicationStates.Paused
&& PrinterConnectionAndCommunication.Instance.PrePauseCommunicationState == PrinterConnectionAndCommunication.CommunicationStates.PrintingFromSd);
if (!printingFromSdCard)
{
PrinterConnectionAndCommunication.Instance.Disable();
}
MatterControlApplication app = MatterControlApplication.Instance;
app.RestartOnClose = false;