Intermediate step

src/comm/SerialLink.cc

@@ -340,7 +340,7 @@ QVector<QString>* SerialLink::getCurrentPorts()
         QextPortInfo portInfo = ports.at(i);
         QString portString = QString(portInfo.portName.toLocal8Bit().constData()) + " - " + QString(ports.at(i).friendName.toLocal8Bit().constData()).split("(").first();
         // Prepend newly found port to the list
-        ports.append(portString);
+        this->ports->append(portString);
     }
 
     //printf("port name: %s\n", ports.at(i).portName.toLocal8Bit().constData());
@@ -349,7 +349,7 @@ QVector<QString>* SerialLink::getCurrentPorts()
     //printf("enumerator name: %s\n", ports.at(i).enumName.toLocal8Bit().constData());
     //printf("===================================\n\n");
 #endif
-    return ports;
+    return this->ports;
 }
 
 void SerialLink::loadSettings()

src/uas/QGCMAVLinkUASFactory.cc

@@ -72,6 +72,7 @@ UASInterface* QGCMAVLinkUASFactory::createUAS(MAVLinkProtocol* mavlink, LinkInte
         uas = mav;
     }
     break;
+#ifdef QGC_USE_SENSESOAR_MESSAGES
 	case MAV_AUTOPILOT_SENSESOAR:
 		{
 			senseSoarMAV* mav = new senseSoarMAV(mavlink,sysid);
@@ -80,6 +81,7 @@ UASInterface* QGCMAVLinkUASFactory::createUAS(MAVLinkProtocol* mavlink, LinkInte
 			uas = mav;
 			break;
 		}
+#endif
     default:
     {
         UAS* mav = new UAS(mavlink, sysid);

src/uas/UASManager.cc

@@ -248,8 +248,6 @@ UASManager::~UASManager()
     foreach (UASInterface* mav, systems) {
         delete mav;
     }
-	this->quit();
-	this->wait();
 }
 
 void UASManager::addUAS(UASInterface* uas)

src/ui/MainWindow.cc

@@ -1499,7 +1499,7 @@ QList<QAction*> MainWindow::listLinkMenuActions(void)
 {
     return ui.menuNetwork->actions();
 }
-
+/*
 void MainWindow::buildSenseSoarWidgets()
 {
 	if (!linechartWidget) 
@@ -1603,3 +1603,4 @@ void MainWindow::arrangeSenseSoarCenterStack()
 void MainWindow::connectSenseSoarActions()
 {
 }
+*/
\ No newline at end of file