From 232a18f8872245786158f9779c6f5d2744b69801 Mon Sep 17 00:00:00 2001
From: Tomaz Canabrava <tomaz.canabrava@intel.com>
Date: Tue, 26 Apr 2016 15:11:06 -0300
Subject: [PATCH] Propertly show / hide the bitmask edit

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
---
 src/QmlControls/ParameterEditorDialog.qml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/QmlControls/ParameterEditorDialog.qml b/src/QmlControls/ParameterEditorDialog.qml
index 58bc43a53..8de10d0fb 100644
--- a/src/QmlControls/ParameterEditorDialog.qml
+++ b/src/QmlControls/ParameterEditorDialog.qml
@@ -47,7 +47,6 @@ QGCViewDialog {
     QGCPalette { id: qgcPal; colorGroupEnabled: true }
 
     function accept() {
-        /*
         if (bitmaskEditor.visible) {
             var value = 0;
             for (var i = 0; i < fact.bitmaskValues.length; ++i) {
@@ -58,8 +57,9 @@ QGCViewDialog {
             }
             fact.value = value;
             fact.valueChanged(fact.value)
+            hideDialog();
         }
-        else */ if (factCombo.visible) {
+        else if (factCombo.visible) {
             fact.enumIndex = factCombo.currentIndex
             hideDialog()
         } else {
@@ -152,10 +152,11 @@ QGCViewDialog {
 
             Column {
                 spacing: ScreenTools.defaultFontPixelHeight / 2
-
+                visible: fact.bitmaskStrings.length > 0 ? true : false;
                 Repeater {
                     id: bitmaskEditor
                     model: fact.bitmaskStrings
+
                     delegate : QGCCheckBox {
                         text : modelData
                         checked : fact.value & fact.bitmaskValues[index]
-- 
2.22.0