Merge pull request #5173 from DonLakeFlyer/StopOneMocklink

Stop one MockLink at a time

src/QmlControls/QGroundControlQmlGlobal.cc

@@ -137,7 +137,7 @@ void QGroundControlQmlGlobal::startAPMArduSubMockLink(bool sendStatusText)
 #endif
 }
 
-void QGroundControlQmlGlobal::stopAllMockLinks(void)
+void QGroundControlQmlGlobal::stopOneMockLink(void)
 {
 #ifdef QT_DEBUG
     LinkManager* linkManager = qgcApp()->toolbox()->linkManager();
@@ -148,6 +148,7 @@ void QGroundControlQmlGlobal::stopAllMockLinks(void)
 
         if (mockLink) {
             linkManager->disconnectLink(mockLink);
+            return;
         }
     }
 #endif

src/QmlControls/QGroundControlQmlGlobal.h

@@ -92,7 +92,7 @@ public:
     Q_INVOKABLE void    startAPMArduCopterMockLink  (bool sendStatusText);
     Q_INVOKABLE void    startAPMArduPlaneMockLink   (bool sendStatusText);
     Q_INVOKABLE void    startAPMArduSubMockLink     (bool sendStatusText);
-    Q_INVOKABLE void    stopAllMockLinks            (void);
+    Q_INVOKABLE void    stopOneMockLink             (void);
 
     /// Converts from meters to the user specified distance unit
     Q_INVOKABLE QVariant metersToAppSettingsDistanceUnits(const QVariant& meters) const { return FactMetaData::metersToAppSettingsDistanceUnits(meters); }

src/ui/preferences/MockLink.qml

@@ -61,8 +61,8 @@ Rectangle {
                 text:   qsTr("Send status text + voice")
             }
             QGCButton {
-                text:       qsTr("Stop All MockLinks")
-                onClicked:  QGroundControl.stopAllMockLinks()
+                text:       qsTr("Stop One MockLink")
+                onClicked:  QGroundControl.stopOneMockLink()
             }
         }
     }