1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-30 08:24:11 +01:00

GCS: When PipX is detected do not make it the active configuration tab to prevent the dialog about dirty tabs appearing.

Conflicts:

	ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
This commit is contained in:
James Cotton 2012-08-19 21:17:37 -05:00
parent bb26f5118d
commit 4a0d43cb54

View File

@ -218,7 +218,6 @@ void ConfigGadgetWidget::tabAboutToChange(int i,bool * proceed)
*/ */
void ConfigGadgetWidget::updatePipXStatus(UAVObject *object) void ConfigGadgetWidget::updatePipXStatus(UAVObject *object)
{ {
// Restart the disconnection timer. // Restart the disconnection timer.
pipxTimeout->start(5000); pipxTimeout->start(5000);
if (!pipxConnected) if (!pipxConnected)
@ -226,7 +225,6 @@ void ConfigGadgetWidget::updatePipXStatus(UAVObject *object)
qDebug()<<"ConfigGadgetWidget onPipxtremeConnect"; qDebug()<<"ConfigGadgetWidget onPipxtremeConnect";
QWidget *qwd = new ConfigPipXtremeWidget(this); QWidget *qwd = new ConfigPipXtremeWidget(this);
ftw->insertTab(ConfigGadgetWidget::pipxtreme, qwd, QIcon(":/configgadget/images/PipXtreme.png"), QString("PipXtreme")); ftw->insertTab(ConfigGadgetWidget::pipxtreme, qwd, QIcon(":/configgadget/images/PipXtreme.png"), QString("PipXtreme"));
ftw->setCurrentIndex(ConfigGadgetWidget::pipxtreme);
pipxConnected = true; pipxConnected = true;
} }
} }