Browse Source

Fixed another init bug

QGC4.4
Lorenz Meier 12 years ago
parent
commit
10d1c8280b
  1. 6
      src/ui/HDDisplay.cc

6
src/ui/HDDisplay.cc

@ -128,8 +128,8 @@ HDDisplay::HDDisplay(QStringList* plotList, QString title, QWidget *parent) :
if (font.family() != fontFamilyName) qDebug() << "ERROR! Font not loaded: " << fontFamilyName; if (font.family() != fontFamilyName) qDebug() << "ERROR! Font not loaded: " << fontFamilyName;
// Connect with UAS // Connect with UAS
connect(UASManager::instance(), SIGNAL(activeUASSet(UASInterface*)), this, SLOT(setActiveUAS(UASInterface*))); connect(UASManager::instance(), SIGNAL(activeUASSet(UASInterface*)), this, SLOT(setActiveUAS(UASInterface*)), Qt::UniqueConnection);
//start(); setActiveUAS(UASManager::instance()->getActiveUAS());
} }
HDDisplay::~HDDisplay() HDDisplay::~HDDisplay()
@ -476,6 +476,8 @@ void HDDisplay::renderOverlay()
*/ */
void HDDisplay::setActiveUAS(UASInterface* uas) void HDDisplay::setActiveUAS(UASInterface* uas)
{ {
if (!uas)
return;
// Disconnect any previously connected active UAS // Disconnect any previously connected active UAS
if (this->uas != NULL) { if (this->uas != NULL) {
removeSource(this->uas); removeSource(this->uas);

Loading…
Cancel
Save