rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-16 08:29:15 +01:00
Code Issues Releases Activity

GCS-Fix eventloop on the connect board while loop

Browse Source
This commit is contained in:
PT_Dreamer 2012-10-15 19:39:20 +01:00
parent e78cd29c5f
commit b318861619
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -446,14 +446,20 @@ bool UploaderGadgetWidget::autoUpdate()
delete dfu; delete dfu;
dfu = NULL; dfu = NULL;
} }
QEventLoop loop;
QTimer timer;
timer.setSingleShot(true);
connect(&timer,SIGNAL(timeout()),&loop,SLOT(quit()));
while(USBMonitor::instance()->availableDevices(0x20a0,-1,-1,-1).length()>0) while(USBMonitor::instance()->availableDevices(0x20a0,-1,-1,-1).length()>0)
{ {
emit autoUpdateSignal(WAITING_DISCONNECT,QVariant()); emit autoUpdateSignal(WAITING_DISCONNECT,QVariant());
if(QMessageBox::warning(this,tr("OpenPilot Uploader"),tr("Please disconnect all openpilot boards"),QMessageBox::Ok,QMessageBox::Cancel)==QMessageBox::Cancel) if(QMessageBox::warning(this,tr("OpenPilot Uploader"),tr("Please disconnect all openpilot boards"),QMessageBox::Ok,QMessageBox::Cancel)==QMessageBox::Cancel)
{ {
emit autoUpdateSignal(FAILURE,QVariant()); emit autoUpdateSignal(FAILURE,QVariant());
return false; return false;
} }
timer.start(500);
loop.exec();
} }
emit autoUpdateSignal(WAITING_CONNECT,0); emit autoUpdateSignal(WAITING_CONNECT,0);
autoUpdateConnectTimeout=0; autoUpdateConnectTimeout=0;