3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bugfix: wrong error handling in GCodeSender

Browse source
This commit is contained in:
Alessandro Ranellucci 2015-11-03 23:08:16 +01:00
parent 8f7e820a01
commit 1d10e463a3
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
xs/src/libslic3r/GCodeSender.cpp
View file

@ -24,8 +24,8 @@ namespace Slic3r {
namespace asio = boost::asio;
GCodeSender::GCodeSender()
: io(), serial(io), can_send(false), sent(0), error(false), connected(false),
queue_paused(false)
: io(), serial(io), can_send(false), sent(0), open(false), error(false),
connected(false), queue_paused(false)
{}
GCodeSender::~GCodeSender()
@ -36,11 +36,11 @@ GCodeSender::~GCodeSender()
bool
GCodeSender::connect(std::string devname, unsigned int baud_rate)
{
this->set_error_status(false);
try {
this->serial.open(devname);
} catch (boost::system::system_error &e) {
this->error = true;
this->set_error_status(true);
return false;
}
@ -214,6 +214,7 @@ GCodeSender::getB() const
void
GCodeSender::do_close()
{
this->set_error_status(false);
boost::system::error_code ec;
this->serial.cancel(ec);
if (ec) this->set_error_status(true);
@ -256,6 +257,7 @@ void
GCodeSender::on_read(const boost::system::error_code& error,
size_t bytes_transferred)
{
this->set_error_status(false);
if (error) {
// error can be true even because the serial port was closed.
// In this case it is not a real error, so ignore.