diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-04-05 16:13:19 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-04-05 16:13:19 -0700 |
| commit | 8cee06729c6b4bde607600fbdb333d9c579690dd (patch) | |
| tree | 36741b534d70f3945d6d4e3ca720e98ab88aa3c8 /grc/python/Block.py | |
| parent | 6ac74a242c12b7e759403176c757b3042a67d0d1 (diff) | |
| parent | eff39c93b2caef8906c38c3f424bcacb5cd0acd8 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'grc/python/Block.py')
| -rw-r--r-- | grc/python/Block.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/grc/python/Block.py b/grc/python/Block.py index f43b006e5f..368a7ea391 100644 --- a/grc/python/Block.py +++ b/grc/python/Block.py @@ -282,11 +282,10 @@ class Block(_Block, _GUIBlock): self._params.remove(param) for key, value in blk_io.params: - if key in params: + try: param = params[key] - if not param.value_is_default(): - param.set_value(value) - else: + param.set_default(value) + except KeyError: # need to make a new param name = key.replace('_', ' ').title() n = odict(dict(name=name, key=key, type='raw', value=value)) param = platform.Param(block=self, n=n) |