From e7bf3556587f2a19906e06d649557d2363664aac Mon Sep 17 00:00:00 2001
From: Sylvain MOUQUET <sylvain.mouquet@gmail.com>
Date: Sun, 18 Jan 2015 21:08:46 +0100
Subject: [PATCH] fix merge

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

diff --git a/glances/plugins/glances_load.py b/glances/plugins/glances_load.py
index 49d971d0..2e066247 100644
--- a/glances/plugins/glances_load.py
+++ b/glances/plugins/glances_load.py
@@ -121,11 +121,12 @@ class Plugin(GlancesPlugin):
         # Call the father's method
         GlancesPlugin.update_views(self)
 
-        # Add specifics informations
-        # 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'])
+        if self.views != {}:
+            # Add specifics informations
+            # 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'])
 
     def msg_curse(self, args=None):
         """Return the dict to display in the curse interface."""