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

Only fire OnConnectionSucceeded if connected

Browse source
This commit is contained in:
John Lewin 2014-10-31 13:31:38 -07:00
parent 2436f0257e
commit 3685877ab7
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
PrinterCommunication/PrinterConnectionAndCommunication.cs
View file

@ -1339,15 +1339,17 @@ namespace MatterHackers.MatterControl.PrinterCommunication
return true;
}
}
else if (CommunicationState == CommunicationStates.FailedToConnect)
{
connectThread.Join(JoinThreadTimeoutMs);
return false;
}
else
{
connectThread.Join(JoinThreadTimeoutMs); //Halt connection thread
OnConnectionSucceeded(null);
// If we're no longer in the .AttemptingToConnect state, shutdown the connection thread and fire the
// OnConnectonSuccess event if we're connected
connectThread.Join(JoinThreadTimeoutMs);
if(PrinterIsConnected)
{
OnConnectionSucceeded(null);
}
return false;
}
}