From 9b857eb53bd2b136d9ea5f62916934540e1297b6 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 31 Aug 2017 16:16:43 -0700
Subject: [PATCH] Ensure "enabled" binding stays in place

---
 interface/resources/qml/AssetServer.qml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/interface/resources/qml/AssetServer.qml b/interface/resources/qml/AssetServer.qml
index 36ef3e69f8..f4b434ae5a 100644
--- a/interface/resources/qml/AssetServer.qml
+++ b/interface/resources/qml/AssetServer.qml
@@ -604,10 +604,16 @@ ScrollingWindow {
             }
 
             HifiControls.CheckBox {
+                function isChecked() {
+                    var status = assetProxyModel.data(treeView.selection.currentIndex, 0x105);
+                    var bakingDisabled = (status === "Not Baked" || status === "--");
+                    return selectedItems === 1 && !bakingDisabled; 
+                }
+
                 text: "Use baked (optimized) versions"
                 colorScheme: root.colorScheme
                 enabled: selectedItems === 1 && assetProxyModel.data(treeView.selection.currentIndex, 0x105) !== "--"
-                checked: selectedItems === 1 && assetProxyModel.data(treeView.selection.currentIndex, 0x105) === "Baked";
+                checked: isChecked()
                 onClicked: {
                     var mappings = [];
                     for (var i in treeView.selection.selectedIndexes) {
@@ -619,6 +625,8 @@ ScrollingWindow {
                     Assets.setBakingEnabled(mappings, checked, function() {
                         reload();
                     });
+
+                    checked = Qt.binding(isChecked);
                 }
             }
         }