Merge pull request #1589 from DonLakeFlyer/AnimationFix

Animation fix

src/AutoPilotPlugins/PX4/SensorsComponent.qml

@@ -186,7 +186,7 @@ QGCView {
                 Component {
                     id: compass0ComponentLabel
 
-                    QGCLabel { text: "Compass Orientation" }
+                    QGCLabel { text: "External Compass Orientation" }
                 }
                 Component {
                     id: compass0ComponentCombo
@@ -470,7 +470,7 @@ QGCView {
                     Column {
                         x: parent.width - rotationColumnWidth
 
-                        QGCLabel { text: "Autpilot Orientation" }
+                        QGCLabel { text: "Autopilot Orientation" }
 
                         FactComboBox {
                             id:     boardRotationCombo
@@ -483,7 +483,7 @@ QGCView {
                         Component {
                             id: compass0ComponentLabel2
 
-                            QGCLabel { text: "Compass Orientation" }
+                            QGCLabel { text: "External Compass Orientation" }
                         }
                         Component {
                             id: compass0ComponentCombo2

src/QmlControls/QGCView.qml

@@ -106,7 +106,15 @@ FactPanel {
         }
     }
 
+    function __stopAllAnimations() {
+        if (__animateHideDialog.running) {
+            __animateHideDialog.stop()
+        }
+    }
+
     function showDialog(component, title, charWidth, buttons) {
+        __stopAllAnimations()
+
         __dialogCharWidth = charWidth
         __dialogTitle = title
 
@@ -120,6 +128,8 @@ FactPanel {
     }
 
     function showMessage(title, message, buttons) {
+        __stopAllAnimations()
+
         __dialogCharWidth = 50
         __dialogTitle = title
         __messageDialogText = message