diff options
| -rw-r--r-- | gnuradio-core/src/python/gnuradio/blks2impl/generic_usrp.py | 9 | ||||
| -rwxr-xr-x | gr-utils/src/python/usrp_siggen.py | 9 |
2 files changed, 9 insertions, 9 deletions
diff --git a/gnuradio-core/src/python/gnuradio/blks2impl/generic_usrp.py b/gnuradio-core/src/python/gnuradio/blks2impl/generic_usrp.py index 5abbaf9eb..6daa4e7a2 100644 --- a/gnuradio-core/src/python/gnuradio/blks2impl/generic_usrp.py +++ b/gnuradio-core/src/python/gnuradio/blks2impl/generic_usrp.py @@ -122,10 +122,13 @@ class _generic_usrp_base(object): if self._type == USRP1_TYPE: return self._subdev.set_auto_tr(enable) def __del__(self): - try: # Avoid weak reference error - del self._u + #delete usrp1 specific subdev + if self._type == USRP1_TYPE: del self._subdev - except: pass + self._subdev = None + #delete the usrp device + del self._u + self._u = None ######################################################################## # generic usrp source diff --git a/gr-utils/src/python/usrp_siggen.py b/gr-utils/src/python/usrp_siggen.py index 8ee8cfd2a..69925fd0e 100755 --- a/gr-utils/src/python/usrp_siggen.py +++ b/gr-utils/src/python/usrp_siggen.py @@ -318,9 +318,6 @@ if __name__ == "__main__": print e sys.exit(1) - # Run it - try: - tb.run() - - except KeyboardInterrupt: - pass + tb.start() + raw_input('Press Enter to quit: ') + tb.stop() |