Merge branch 'master' of github.com:mavlink/qgroundcontrol

src/uas/UAS.cc

@@ -1100,6 +1100,8 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
             imageWidth = p.width;
             imageHeight = p.height;
             imageStart = QGC::groundTimeMilliseconds();
+            imagePacketsArrived = 0;
+
         }
             break;
 
@@ -1132,7 +1134,6 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
             if ((imagePacketsArrived >= imagePackets))
             {
                 // Restart statemachine
-                imagePacketsArrived = 0;
                 emit imageReady(this);
                 //qDebug() << "imageReady emitted. all packets arrived";
             }

src/ui/QGCToolBar.cc

@@ -403,7 +403,7 @@ void QGCToolBar::setSystemType(UASInterface* uas, unsigned int systemType)
             symbolButton->setIcon(QIcon(":/files/images/mavs/helicopter.svg"));
             break;
         case MAV_TYPE_ANTENNA_TRACKER:
-            symbolButton->setIcon(QIcon(":/files/images/mavs/antenn-tracker.svg"));
+            symbolButton->setIcon(QIcon(":/files/images/mavs/antenna-tracker.svg"));
             break;
         case MAV_TYPE_GCS:
             symbolButton->setIcon(QIcon(":files/images/mavs/groundstation.svg"));

src/ui/uas/UASControlWidget.cc

@@ -178,6 +178,12 @@ void UASControlWidget::transmitMode()
     UASInterface* mav = UASManager::instance()->getUASForId(this->uas);
     if (mav)
     {
+        // include armed state
+        if (engineOn)
+            uasMode |= MAV_MODE_FLAG_SAFETY_ARMED;
+        else
+            uasMode &= ~MAV_MODE_FLAG_SAFETY_ARMED;
+
         mav->setMode(uasMode);
         QString mode = ui.modeComboBox->currentText();