Merge pull request #4601 from tacaswell/fix_qt_figureoption_legend

jenshnielsen · jenshnielsen · commit 8b5e226185dc · 2015-07-07T21:50:02.000-05:00
FIX: handle empty legend in qt figureoption
diff --git a/lib/matplotlib/backends/qt_editor/figureoptions.py b/lib/matplotlib/backends/qt_editor/figureoptions.py
@@ -141,14 +141,17 @@ def apply_callback(data):
                     line.set_markeredgecolor(markeredgecolor)
 
         # re-generate legend, if checkbox is checked
+
         if generate_legend:
+            draggable = None
+            ncol = None
             if axes.legend_ is not None:
                 old_legend = axes.get_legend()
-                new_legend = axes.legend(ncol=old_legend._ncol)
-                new_legend.draggable(old_legend._draggable is not None)
-            else:
-                new_legend = axes.legend()
-                new_legend.draggable(True)
+                draggable = old_legend._draggable is not None
+                ncol = old_legend._ncol
+            new_legend = axes.legend(ncol=ncol)
+            if new_legend:
+                new_legend.draggable(draggable)
 
         # Redraw
         figure = axes.get_figure()
