From 6f9d1795dba5b6d6806f9dde25bd61c1d5d04583 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Thu, 1 Jan 2015 21:24:25 +0100
Subject: [PATCH] Fixes #1965 Conflicts: 
 companion/src/modeledit/telemetry.cpp

---
 companion/src/modeledit/telemetry.cpp | 48 +++++++++++++++------------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/companion/src/modeledit/telemetry.cpp b/companion/src/modeledit/telemetry.cpp
index 881dcc73b..ee2215640 100644
--- a/companion/src/modeledit/telemetry.cpp
+++ b/companion/src/modeledit/telemetry.cpp
@@ -663,19 +663,6 @@ TelemetryPanel::TelemetryPanel(QWidget *parent, ModelData & model, GeneralSettin
     model.frsky.usrProto = 1;
   }
 
-  if (IS_ARM(firmware->getBoard())) {
-    ui->telemetryProtocol->addItem(tr("FrSky S.PORT"), 0);
-    ui->telemetryProtocol->addItem(tr("FrSky D"), 1);
-    if (IS_9XRPRO(firmware->getBoard())) {
-      ui->telemetryProtocol->addItem(tr("FrSky D (cable)"), 2);
-    }
-    ui->telemetryProtocol->setCurrentIndex(model.telemetryProtocol);
-  }
-  else {
-    ui->telemetryProtocolLabel->hide();
-    ui->telemetryProtocol->hide();
-  }
-
   if (IS_ARM(firmware->getBoard())) {
     ui->A1GB->hide();
     ui->A2GB->hide();
@@ -748,6 +735,19 @@ void TelemetryPanel::setup()
 
     lock = true;
 
+    if (IS_ARM(firmware->getBoard())) {
+      ui->telemetryProtocol->addItem(tr("FrSky S.PORT"), 0);
+      ui->telemetryProtocol->addItem(tr("FrSky D"), 1);
+      if (IS_9XRPRO(firmware->getBoard())) {
+        ui->telemetryProtocol->addItem(tr("FrSky D (cable)"), 2);
+      }
+      ui->telemetryProtocol->setCurrentIndex(model->telemetryProtocol);
+    }
+    else {
+      ui->telemetryProtocolLabel->hide();
+      ui->telemetryProtocol->hide();
+    }
+
     ui->rssiAlarm1SB->setValue(model->frsky.rssiAlarms[0].value);
     ui->rssiAlarm2SB->setValue(model->frsky.rssiAlarms[1].value);
     if (!IS_TARANIS(firmware->getBoard())) {
@@ -890,8 +890,10 @@ void TelemetryPanel::populateCurrentSource()
 
 void TelemetryPanel::on_telemetryProtocol_currentIndexChanged(int index)
 {
-  model->telemetryProtocol = index;
-  emit modified();
+  if (!lock) {
+    model->telemetryProtocol = index;
+    emit modified();
+  }
 }
 
 void TelemetryPanel::onAnalogModified()
@@ -901,16 +903,20 @@ void TelemetryPanel::onAnalogModified()
 
 void TelemetryPanel::on_bladesCount_editingFinished()
 {
-  model->frsky.blades = ui->bladesCount->value();
-  emit modified();
+  if (!lock) {
+    model->frsky.blades = ui->bladesCount->value();
+    emit modified();
+  }
 }
 
 void TelemetryPanel::on_frskyProtoCB_currentIndexChanged(int index)
 {
-  model->frsky.usrProto = index;
-  for (int i=0; i<firmware->getCapability(TelemetryCustomScreens); i++)
-    telemetryCustomScreens[i]->update();
-  emit modified();
+  if (!lock) {
+    model->frsky.usrProto = index;
+    for (int i=0; i<firmware->getCapability(TelemetryCustomScreens); i++)
+      telemetryCustomScreens[i]->update();
+    emit modified();
+  }
 }
 
 void TelemetryPanel::on_rssiAlarm1CB_currentIndexChanged(int index)