From beb21ab7db0712b89710e9de03318039102d3f9c Mon Sep 17 00:00:00 2001
From: Neil Horne <neilh713@tpg.com.au>
Date: Wed, 8 Jun 2016 07:34:02 +1000
Subject: [PATCH] Fixes #3547: Flight modes linked trims display value (#3568)
 (ported from master)

---
 companion/src/eeprominterface.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp
index 8d14f6e61..306d0f8d1 100644
--- a/companion/src/eeprominterface.cpp
+++ b/companion/src/eeprominterface.cpp
@@ -1510,9 +1510,7 @@ int ModelData::getTrimValue(int phaseIdx, int trimIdx)
       }
       else {
         phaseIdx = phase.trimRef[trimIdx];
-        if (phase.trimMode[trimIdx] == 0)
-          result = 0;
-        else
+        if (phase.trimMode[trimIdx] != 0)
           result += phase.trim[trimIdx];
       }
     }
@@ -1858,4 +1856,4 @@ unsigned int getNumSubtypes(MultiModuleRFProtocols type) {
       return 1;
   }
 
-}
\ No newline at end of file
+}