diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-04-05 16:12:39 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-04-05 16:12:39 -0700 |
| commit | eff39c93b2caef8906c38c3f424bcacb5cd0acd8 (patch) | |
| tree | 3dee3246e90b3baaf7548a6c64d9aa000f3fc977 /grc/python/Block.py | |
| parent | 5e383b0b6ef90cc555803856b82609dca6f8186a (diff) | |
| parent | d0eab54716703ed8aefec26539a6b94dfba38245 (diff) | |
Merge branch 'maint'
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) |