fixup! fix: prevent deadlockwith stuck bulk transfer

acolombier · Oct 11, 2024 · fbd5fe5 · fbd5fe5
1 parent 74de707
commit fbd5fe5
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/controllers/bulk/bulkcontroller.cpp b/src/controllers/bulk/bulkcontroller.cpp
@@ -10,9 +10,8 @@
 #include "util/trace.h"
 
 namespace {
-using namespace std::literals;
-constexpr std::seconds kBulkSendTimeout = 5s;
-} // namespace
+constexpr unsigned int kBulkSendTimeoutMs = 5000; // In milliseconds
+}
 
 BulkReader::BulkReader(libusb_device_handle *handle, unsigned char in_epaddr)
         : QThread(),
@@ -305,10 +304,11 @@ void BulkController::sendBytes(const QByteArray& data) {
             (unsigned char*)data.constData(),
             data.size(),
             &transferred,
-            std::milliseconds(kBulkSendTimeout).count();
+            kBulkSendTimeoutMs);
     if (ret < 0) {
         qCWarning(m_logOutput) << "Unable to send data to" << getName()
                                << "serial #" << m_sUID << "-" << libusb_error_name(ret);
+        ;
     } else if (CmdlineArgs::Instance().getControllerDebug()) {
         qCDebug(m_logOutput) << transferred << "bytes sent to" << getName()
                              << "serial #" << m_sUID;