Merge branch 'master' into next

1 files changed, 16 insertions, 9 deletions

diff --git a/gr-uhd/apps/uhd_fft.py b/gr-uhd/apps/uhd_fft.py
index 0d800d185..18edc8f86 100755
--- a/gr-uhd/apps/uhd_fft.py
+++ b/gr-uhd/apps/uhd_fft.py
@@ -181,17 +181,24 @@ class app_top_block(stdgui2.std_top_block):
         g = self.u.get_gain_range()
 
         # some configurations don't have gain control
-        if g.stop() > g.start():
-            myform['gain'] = form.slider_field(parent=self.panel,
-                                                   sizer=hbox, label="Gain",
-                                                   weight=3,
-                                                   min=int(g.start()), max=int(g.stop()),
-                                                   callback=self.set_gain)
+        if g.stop() <= g.start():
+            glow = 0.0
+            ghigh = 1.0
+            
+        else:
+            glow = g.start()
+            ghigh = g.stop()
+            
+        myform['gain'] = form.slider_field(parent=self.panel,
+                                               sizer=hbox, label="Gain",
+                                               weight=3,
+                                               min=int(glow), max=int(ghigh),
+                                               callback=self.set_gain)
 
-            hbox.Add((5,0), 0, 0)
-            vbox.Add(hbox, 0, wx.EXPAND)
+        hbox.Add((5,0), 0, 0)
+        vbox.Add(hbox, 0, wx.EXPAND)
 
-            self._build_subpanel(vbox)
+        self._build_subpanel(vbox)
 
     def _build_subpanel(self, vbox_arg):
         # build a secondary information panel (sometimes hidden)