Merge remote-tracking branch 'origin/master'

2016-08-30 23:16:12 -04:00
parent ed24ef2615 e31f3cb46e
commit ef06a1ccb1
2 changed files with 11 additions and 11 deletions
--- a/gui/builtinViews/fittingView.py
+++ b/gui/builtinViews/fittingView.py
@@ -557,7 +557,7 @@ class FittingView(d.Display):
                     5: ''}

    def slotColour(self, slot):
-        return self.slotColourMap[slot] or self.GetBackgroundColour()
+        return self.slotColourMap.get(slot) or self.GetBackgroundColour()

    def refresh(self, stuff):
        '''