From b6b5230dcd5ec934afa9c45dec29a79bd812c372 Mon Sep 17 00:00:00 2001
From: Nicolargo <nicolas@nicolargo.com>
Date: Sat, 24 Jan 2015 16:30:20 +0100
Subject: [PATCH] Resolve merge issue

---
 glances/plugins/glances_load.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/glances/plugins/glances_load.py b/glances/plugins/glances_load.py
index 2e066247..aa6e8a13 100644
--- a/glances/plugins/glances_load.py
+++ b/glances/plugins/glances_load.py
@@ -121,12 +121,15 @@ class Plugin(GlancesPlugin):
         # Call the father's method
         GlancesPlugin.update_views(self)
 
-        if self.views != {}:
-            # Add specifics informations
+        # Add specifics informations
+        try:
             # Alert and log
             self.views['min15']['decoration'] = self.get_alert_log(self.stats['min15'], max=100 * self.stats['cpucore'])
             # Alert only
             self.views['min5']['decoration'] = self.get_alert(self.stats['min5'], max=100 * self.stats['cpucore'])
+        except KeyError:
+            # try/except mandatory for Windows compatibility (no load stats)
+            pass
 
     def msg_curse(self, args=None):
         """Return the dict to display in the curse interface."""