Bug fixes.

Moving source files into Vehicles as it is a more coherent place.

qgroundcontrol.pro

@@ -334,7 +334,7 @@ HEADERS += \
     src/uas/UAS.h \
     src/uas/UASInterface.h \
     src/uas/UASMessageHandler.h \
-    src/uas/MavlinkLogManager.h \
+    src/Vehicle/MavlinkLogManager.h \
     src/ui/toolbar/MainToolBarController.h \
     src/AutoPilotPlugins/PX4/PX4AirframeLoader.h \
     src/AutoPilotPlugins/APM/APMAirframeLoader.h \
@@ -499,7 +499,7 @@ SOURCES += \
     src/QmlControls/QmlObjectListModel.cc \
     src/uas/UAS.cc \
     src/uas/UASMessageHandler.cc \
-    src/uas/MavlinkLogManager.cc \
+    src/Vehicle/MavlinkLogManager.cc \
     src/ui/toolbar/MainToolBarController.cc \
     src/AutoPilotPlugins/PX4/PX4AirframeLoader.cc \
     src/AutoPilotPlugins/APM/APMAirframeLoader.cc \

src/uas/MavlinkLogManager.cc → src/Vehicle/MavlinkLogManager.cc

@@ -37,6 +37,7 @@ MavlinkLogFiles::MavlinkLogFiles(MavlinkLogManager* manager, const QString& file
     , _selected(false)
     , _uploading(false)
     , _progress(0)
+    , _writing(false)
 {
     QFileInfo fi(filePath);
     _name = fi.baseName();
@@ -84,6 +85,17 @@ MavlinkLogFiles::setWriting(bool writing)
     emit writingChanged();
 }
 
+//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
+void CurrentRunningLog::close()
+{
+    if(fd) {
+        fclose(fd);
+        fd = NULL;
+    }
+}
+
+//-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 MavlinkLogManager::MavlinkLogManager(QGCApplication* app)
     : QGCTool(app)
@@ -533,7 +545,7 @@ MavlinkLogManager::_activeVehicleChanged(Vehicle* vehicle)
 void
 MavlinkLogManager::_mavlinkLogData(Vehicle* /*vehicle*/, uint8_t /*target_system*/, uint8_t /*target_component*/, uint16_t sequence, uint8_t length, uint8_t first_message, const uint8_t* data, bool /*acked*/)
 {
-    if(_currentSavingFile) {
+    if(_currentSavingFile && _currentSavingFile->fd) {
         if(sequence != _sequence) {
             qCWarning(MavlinkLogManagerLog) << "Dropped Mavlink log data";
             if(first_message < 255) {
@@ -557,7 +569,6 @@ MavlinkLogManager::_mavlinkLogData(Vehicle* /*vehicle*/, uint8_t /*target_system
     }
     //-- Update file size
     if(_currentSavingFile) {
-        _currentSavingFile->close();
         if(_currentSavingFile->record) {
             quint32 size = _currentSavingFile->record->size() + length;
             _currentSavingFile->record->setSize(size);

src/uas/MavlinkLogManager.h → src/Vehicle/MavlinkLogManager.h

@@ -81,13 +81,7 @@ public:
     {
         close();
     }
-    void close()
-    {
-        if(fd) {
-            fclose(fd);
-            fd = NULL;
-        }
-    }
+    void close();
     FILE*               fd;
     QString             fileName;
     MavlinkLogFiles*    record;

src/ui/preferences/MavlinkSettings.qml

@@ -331,6 +331,7 @@ Rectangle {
                                     QGCCheckBox {
                                         width:      ScreenTools.defaultFontPixelWidth * 4
                                         checked:    object.selected
+                                        enabled:    !object.writing && !object.uploading
                                         onClicked:  {
                                             object.selected = checked
                                         }