Merge remote-tracking branch 'origin/singularity'

2015-12-07 19:39:45 -05:00
parent cbd2ed603f a0cfe05eb5
commit fbf67c134b
988 changed files with 926 additions and 131 deletions
--- a/gui/builtinViews/fittingView.py
+++ b/gui/builtinViews/fittingView.py
@@ -526,7 +526,8 @@ class FittingView(d.Display):

            # update state tooltip
            tooltip = self.activeColumns[col].getToolTip(self.mods[self.GetItemData(row)])
-            self.SetToolTipString(tooltip)
+            if tooltip:
+                self.SetToolTipString(tooltip)

            wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.mainFrame.getActiveFit()))
        else: