From e801f490b349afeed3e7d49f2dcc4f3f30f24b8a Mon Sep 17 00:00:00 2001
From: elecpower <neilh713@tpg.com.au>
Date: Wed, 17 Mar 2021 06:23:41 +1100
Subject: [PATCH] Check panel lock on update

---
 companion/src/shared/autobitsetcheckbox.h | 23 ++++++++++++++++-------
 companion/src/shared/genericpanel.h       |  1 +
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/companion/src/shared/autobitsetcheckbox.h b/companion/src/shared/autobitsetcheckbox.h
index ea86db956..af831948e 100644
--- a/companion/src/shared/autobitsetcheckbox.h
+++ b/companion/src/shared/autobitsetcheckbox.h
@@ -34,7 +34,8 @@ class AutoBitsetCheckBox: public QCheckBox
     Q_PROPERTY(int toggleMask READ toggleMask WRITE setToggleMask)
 
   public:
-    explicit AutoBitsetCheckBox(QWidget *parent = nullptr)                      : AutoBitsetCheckBox(QString(), parent) {}
+    explicit AutoBitsetCheckBox(QWidget *parent = nullptr) :
+      AutoBitsetCheckBox(QString(), parent) {}
     explicit AutoBitsetCheckBox(const QString &text, QWidget *parent = nullptr) :
       QCheckBox(text, parent)
     {
@@ -42,26 +43,32 @@ class AutoBitsetCheckBox: public QCheckBox
     }
 
     // int field constructors
-    explicit AutoBitsetCheckBox(int & field, int bitmask, const QString &text = QString(), QWidget *parent = nullptr)              : AutoBitsetCheckBox(field, bitmask, false, text, parent) {}
-    explicit AutoBitsetCheckBox(int & field, int bitmask, bool invert, const QString &text = QString(), QWidget *parent = nullptr) : QCheckBox(text, parent)
+    explicit AutoBitsetCheckBox(int & field, int bitmask, const QString &text = QString(), QWidget *parent = nullptr) :
+      AutoBitsetCheckBox(field, bitmask, false, text, parent) {}
+    explicit AutoBitsetCheckBox(int & field, int bitmask, bool invert, const QString &text = QString(), QWidget *parent = nullptr) :
+      QCheckBox(text, parent)
     {
       setField(field, bitmask, invert);
       init();
     }
-    explicit AutoBitsetCheckBox(int & field, int bitmask, int toggleMask, const QString &text = QString(), QWidget *parent = nullptr) : QCheckBox(text, parent)
+    explicit AutoBitsetCheckBox(int & field, int bitmask, int toggleMask, const QString &text = QString(), QWidget *parent = nullptr) :
+      QCheckBox(text, parent)
     {
       setField(field, bitmask, false, toggleMask);
       init();
     }
 
     // unsigned field constructors
-    explicit AutoBitsetCheckBox(unsigned & field, int bitmask, const QString &text = QString(), QWidget *parent = nullptr)              : AutoBitsetCheckBox(field, bitmask, false, text, parent) {}
-    explicit AutoBitsetCheckBox(unsigned & field, int bitmask, bool invert, const QString &text = QString(), QWidget *parent = nullptr) : QCheckBox(text, parent)
+    explicit AutoBitsetCheckBox(unsigned & field, int bitmask, const QString &text = QString(), QWidget *parent = nullptr) :
+      AutoBitsetCheckBox(field, bitmask, false, text, parent) {}
+    explicit AutoBitsetCheckBox(unsigned & field, int bitmask, bool invert, const QString &text = QString(), QWidget *parent = nullptr) :
+      QCheckBox(text, parent)
     {
       setField(field, bitmask, invert);
       init();
     }
-    explicit AutoBitsetCheckBox(unsigned & field, int bitmask, int toggleMask, const QString &text = QString(), QWidget *parent = nullptr) : QCheckBox(text, parent)
+    explicit AutoBitsetCheckBox(unsigned & field, int bitmask, int toggleMask, const QString &text = QString(), QWidget *parent = nullptr) :
+      QCheckBox(text, parent)
     {
       setField(field, bitmask, false, toggleMask);
       init();
@@ -104,6 +111,8 @@ class AutoBitsetCheckBox: public QCheckBox
 
     void updateValue()
     {
+      if (m_panel && m_panel->lock)
+        return;
       if (!m_field)
         return;
       const bool oldLock = setLocked(true);
diff --git a/companion/src/shared/genericpanel.h b/companion/src/shared/genericpanel.h
index bbb9b7254..fe749b659 100644
--- a/companion/src/shared/genericpanel.h
+++ b/companion/src/shared/genericpanel.h
@@ -39,6 +39,7 @@ class GenericPanel : public QWidget
   friend class AutoLineEdit;
   friend class GVarGroup;
   friend class AutoPrecisionComboBox;
+  friend class AutoBitsetCheckBox;
 
   public:
     GenericPanel(QWidget *parent, ModelData * model, GeneralSettings & generalSettings, Firmware * firmware);