From 0053ca0d27380b5c8e0359d23506fe8a81eeb588 Mon Sep 17 00:00:00 2001 From: Antoine C Date: Tue, 8 Oct 2024 22:08:34 +0100 Subject: [PATCH] fix: prevent deadlockwith stuck bulk transfer --- src/controllers/bulk/bulkcontroller.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/controllers/bulk/bulkcontroller.cpp b/src/controllers/bulk/bulkcontroller.cpp index 6a2d1212b65..737346f1643 100644 --- a/src/controllers/bulk/bulkcontroller.cpp +++ b/src/controllers/bulk/bulkcontroller.cpp @@ -299,11 +299,12 @@ void BulkController::sendBytes(const QByteArray& data) { (unsigned char*)data.constData(), data.size(), &transferred, - 0); + 5000 // Send timeout in milliseconds + ); if (ret < 0) { qCWarning(m_logOutput) << "Unable to send data to" << getName() << "serial #" << m_sUID << "-" << libusb_error_name(ret); - } else { + } else if (CmdlineArgs::Instance().getControllerDebug()) { qCDebug(m_logOutput) << transferred << "bytes sent to" << getName() << "serial #" << m_sUID; }