diff options
author | Josh Blum | 2013-03-31 22:30:00 -0700 |
---|---|---|
committer | Josh Blum | 2013-03-31 22:30:00 -0700 |
commit | 993ff9e8c1050bad327041132828370986a72b28 (patch) | |
tree | e0c58a41a120b4da8b55f42099ccea8d5517019a /grc | |
parent | 78ccc760124713a56c9c85729ac40844a97f0550 (diff) | |
parent | 78cd4026c0a9b902162e94905b60a9dd44a07bb7 (diff) | |
download | gnuradio-993ff9e8c1050bad327041132828370986a72b28.tar.gz gnuradio-993ff9e8c1050bad327041132828370986a72b28.tar.bz2 gnuradio-993ff9e8c1050bad327041132828370986a72b28.zip |
Merge branch 'maint' into v3.6.4git_gras_support
Conflicts:
gnuradio-core/src/lib/runtime/gr_block.cc
gnuradio-core/src/lib/runtime/gr_block.h
Diffstat (limited to 'grc')
-rw-r--r-- | grc/python/Port.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/grc/python/Port.py b/grc/python/Port.py index 4c0175f90..8cc9e9ad0 100644 --- a/grc/python/Port.py +++ b/grc/python/Port.py @@ -90,6 +90,7 @@ class Port(_Port, _GUIPort): """ self._n = n if n['type'] == 'msg': n['key'] = 'msg' + if n['type'] == 'message': n['key'] = n['name'] if dir == 'source' and not n.find('key'): n['key'] = str(block._source_count) block._source_count += 1 |