Merge pull request mavlink#5173 from DonLakeFlyer/StopOneMocklink

Stop one MockLink at a time
UavLabsColombia · May 18, 2017 · 5682c23 · 5682c23
2 parents 52c47fd + 6341bf6
commit 5682c23
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/QmlControls/QGroundControlQmlGlobal.cc b/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

diff --git a/src/QmlControls/QGroundControlQmlGlobal.h b/src/QmlControls/QGroundControlQmlGlobal.h
@@ -92,7 +92,7 @@ class QGroundControlQmlGlobal : public QGCTool
     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); }

diff --git a/src/ui/preferences/MockLink.qml b/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()
             }
         }
     }