From 9f4e47a208dab38cbb254e4e9a7a6dc0a0a9c072 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Tue, 18 Oct 2016 18:34:36 -0700
Subject: [PATCH] Fix brand image visibility calculation

---
 src/ui/toolbar/MainToolBar.qml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ui/toolbar/MainToolBar.qml b/src/ui/toolbar/MainToolBar.qml
index f8b4170e9..c86037067 100644
--- a/src/ui/toolbar/MainToolBar.qml
+++ b/src/ui/toolbar/MainToolBar.qml
@@ -393,6 +393,7 @@ Rectangle {
         property bool vehicleConnectionLost: activeVehicle ? activeVehicle.connectionLost : false
 
         Loader {
+            id:                     indicatorLoader
             source:                 activeVehicle && !parent.vehicleConnectionLost ? "MainToolBarIndicators.qml" : ""
             anchors.left:           parent.left
             anchors.verticalCenter: parent.verticalCenter
@@ -408,7 +409,6 @@ Rectangle {
             anchors.right:          disconnectButton.left
             anchors.verticalCenter: parent.verticalCenter
             visible:                parent.vehicleConnectionLost
-
         }
 
         QGCButton {
@@ -427,7 +427,7 @@ Rectangle {
             anchors.right:          parent.right
             anchors.top:            parent.top
             anchors.bottom:         parent.bottom
-            visible:                parent.x < x && !disconnectButton.visible && source != ""
+            visible:                x > indicatorLoader.x + indicatorLoader.width && !disconnectButton.visible && source != ""
             fillMode:               Image.PreserveAspectFit
             source:                 activeVehicle ? activeVehicle.brandImage : ""
         }
-- 
2.22.0