Merge pull request #6704 from mavlink/qmlFix

Skip custom instrument widget test if none exists.

Merge pull request #6704 from mavlink/qmlFix
Skip custom instrument widget test if none exists.
3284f8b3 · Gus Grubba · GitHub · 3a2a3584 · 7ab86a97 · 3284f8b3
Unverified Commit 3284f8b3 authored Jul 11, 2018 by Gus Grubba Committed by GitHub Jul 11, 2018
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

FlightDisplayViewMap.qml src/FlightDisplay/FlightDisplayViewMap.qml +1 -1

No files found.
--- a/src/FlightDisplay/FlightDisplayViewMap.qml
+++ b/src/FlightDisplay/FlightDisplayViewMap.qml
@@ -101,7 +101,7 @@ FlightMap {
        var vehiclePoint = flightMap.fromCoordinate(_activeVehicleCoordinate, false /* clipToViewport */)
        var toolStripRightEdge = mapFromItem(toolStrip, toolStrip.x, 0).x + toolStrip.width
        var instrumentsWidth = 0
-        if (QGroundControl.corePlugin.options.instrumentWidget.widgetPosition === CustomInstrumentWidget.POS_TOP_RIGHT) {
+        if (QGroundControl.corePlugin.options.instrumentWidget && QGroundControl.corePlugin.options.instrumentWidget.widgetPosition === CustomInstrumentWidget.POS_TOP_RIGHT) {
            // Assume standard instruments
            instrumentsWidth = flightDisplayViewWidgets.getPreferredInstrumentWidth()
        }