Merge remote-tracking branch 'origin/master' into gui3

This commit is contained in:
Alessandro Ranellucci 2017-03-25 15:33:33 +01:00
commit 05e3bdc271

View File

@ -306,7 +306,7 @@ GCodeSender::on_read(const boost::system::error_code& error,
this->set_error_status(false); this->set_error_status(false);
if (error) { if (error) {
#ifdef __APPLE__ #ifdef __APPLE__
if (error.value() == 45 || ) { if (error.value() == 45) {
// OS X bug: http://osdir.com/ml/lib.boost.asio.user/2008-08/msg00004.html // OS X bug: http://osdir.com/ml/lib.boost.asio.user/2008-08/msg00004.html
this->do_read(); this->do_read();
return; return;