Merge pull request #29 from marslandd/tabletbatteryfix

Correct hard battery error on tablet computers
OpenXT · Jan 13, 2016 · f9545c0 · f9545c0
2 parents 8a87473 + 58d1a06
commit f9545c0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/dist/script/index_cache.js b/dist/script/index_cache.js
@@ -144,7 +144,10 @@ XenClient.UI.Cache = (function() {
                device.refresh();
            }
         }
-        XUtils.publish(XenConstants.TopicTypes.UI_BATTERIES_CHANGED);
+        if(bat_count>-1)
+        {// do not refresh the batteries if there are none, may be in the midst of a refresh
+           XUtils.publish(XenConstants.TopicTypes.UI_BATTERIES_CHANGED);
+        }
     };
 
     var allVMPaths = function() {

diff --git a/dist/script/models/batteryModel.js b/dist/script/models/batteryModel.js
@@ -197,7 +197,10 @@ XenClient.UI.BatteryModel = function(bat_num) {
       this.bat_index = XUICache.Host.available_batteries.indexOf(this.bat_num);
 
       var error = function(error) {
-          XUICache.messageBox.showError(error, XenConstants.ToolstackCodes);
+        if(this.bat_num!=undefined)
+        {// suppress errors if the batteries are in the midst of being refreshed
+           XUICache.messageBox.showError(error, XenConstants.ToolstackCodes);
+        }
       };
       var self=this;