From 4a0d43cb54bb8566bea95ef2dca8860157139e9b Mon Sep 17 00:00:00 2001 From: James Cotton Date: Sun, 19 Aug 2012 21:17:37 -0500 Subject: [PATCH] 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 --- .../src/plugins/config/configgadgetwidget.cpp | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp b/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp index c12dbaee8..c466df760 100644 --- a/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp +++ b/ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp @@ -218,17 +218,15 @@ void ConfigGadgetWidget::tabAboutToChange(int i,bool * proceed) */ void ConfigGadgetWidget::updatePipXStatus(UAVObject *object) { - - // Restart the disconnection timer. - pipxTimeout->start(5000); - if (!pipxConnected) - { - qDebug()<<"ConfigGadgetWidget onPipxtremeConnect"; - QWidget *qwd = new ConfigPipXtremeWidget(this); - ftw->insertTab(ConfigGadgetWidget::pipxtreme, qwd, QIcon(":/configgadget/images/PipXtreme.png"), QString("PipXtreme")); - ftw->setCurrentIndex(ConfigGadgetWidget::pipxtreme); - pipxConnected = true; - } + // Restart the disconnection timer. + pipxTimeout->start(5000); + if (!pipxConnected) + { + qDebug()<<"ConfigGadgetWidget onPipxtremeConnect"; + QWidget *qwd = new ConfigPipXtremeWidget(this); + ftw->insertTab(ConfigGadgetWidget::pipxtreme, qwd, QIcon(":/configgadget/images/PipXtreme.png"), QString("PipXtreme")); + pipxConnected = true; + } } void ConfigGadgetWidget::onPipxtremeDisconnect() {