diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-01-15 15:00:24 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-01-15 15:00:24 -0500 |
| commit | 5be31c3d79015beeabdd98ebf1c0152ae6caac8c (patch) | |
| tree | e1d678b4b3dbb5b45c8ca43dfbd5d88451da66c4 /grc | |
| parent | 0c0473d51e2c4a4275a88db562791561288e8c15 (diff) | |
| parent | e1e632469905f8c4b5f0d35c988744c77cf6a227 (diff) | |
Merge branch 'master' into next
Conflicts:
gr-digital/examples/demod/ber_simulation.grc
gr-digital/examples/demod/digital_freq_lock.grc
gr-digital/examples/demod/pam_sync.grc
gr-digital/examples/demod/pam_timing.grc
Diffstat (limited to 'grc')
| -rw-r--r-- | grc/gui/MainWindow.py | 3 | ||||
| -rwxr-xr-x | grc/scripts/gnuradio-companion | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/grc/gui/MainWindow.py b/grc/gui/MainWindow.py index 16a4c63227..c2d661c668 100644 --- a/grc/gui/MainWindow.py +++ b/grc/gui/MainWindow.py @@ -188,6 +188,9 @@ class MainWindow(gtk.Window): if file_path: Messages.send_end_load() except Exception, e: #return on failure Messages.send_fail_load(e) + if isinstance(e, KeyError) and str(e) == "'options'": + # This error is unrecoverable, so crash gracefully + exit(-1) return #add this page to the notebook self.notebook.append_page(page, page.get_tab()) diff --git a/grc/scripts/gnuradio-companion b/grc/scripts/gnuradio-companion index e76322b4d8..dabca3028f 100755 --- a/grc/scripts/gnuradio-companion +++ b/grc/scripts/gnuradio-companion @@ -39,10 +39,19 @@ Is the library path environment variable set correctly? d.run() exit(-1) -from gnuradio import gr from optparse import OptionParser +import os if __name__ == "__main__": + if ('GR_DONT_LOAD_PREFS' in os.environ.keys() and + (not 'GRC_BLOCKS_PATH' in os.environ.keys() or len(os.environ['GRC_BLOCKS_PATH']) == 0)): + d = gtk.MessageDialog( + type=gtk.MESSAGE_ERROR, + buttons=gtk.BUTTONS_CLOSE, + message_format="""Can't find block definitions. Use config.conf or GRC_BLOCKS_PATH. """) + d.set_title("No block definitions available.") + d.run() + exit(-1) usage = 'usage: %prog [options] [saved flow graphs]' version = """ GNU Radio Companion %s |