rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-05 21:52:10 +01:00
Code Issues Releases Activity

GCS USB: Increase the max timeout before giving up on stopping the USB threads.

Browse Source
This commit is contained in:
James Cotton 2012-09-08 19:07:14 -05:00
parent 82f752685a
commit 9b7060a491
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ground/openpilotgcs/src/plugins/rawhid/rawhid.cpp
View File

@ -144,7 +144,7 @@ RawHIDReadThread::~RawHIDReadThread()
{ {
m_running = false; m_running = false;
//wait for the thread to terminate //wait for the thread to terminate
if(wait(1000) == false) if(wait(10000) == false)
qDebug() << "Cannot terminate RawHIDReadThread"; qDebug() << "Cannot terminate RawHIDReadThread";
} }
@ -216,7 +216,7 @@ RawHIDWriteThread::~RawHIDWriteThread()
{ {
m_running = false; m_running = false;
//wait for the thread to terminate //wait for the thread to terminate
if(wait(1000) == false) if(wait(10000) == false)
qDebug() << "Cannot terminate RawHIDReadThread"; qDebug() << "Cannot terminate RawHIDReadThread";
} }

2
ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
View File

@ -456,7 +456,7 @@ void UploaderGadgetWidget::systemRescue()
delete dfu; delete dfu;
dfu = NULL; dfu = NULL;
} }
// Avoid dumb users pressing Rescue twice. It can happen. // Avoid users pressing Rescue twice.
m_config->rescueButton->setEnabled(false); m_config->rescueButton->setEnabled(false);
// Now we're good to go: // Now we're good to go: