diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2012-11-30 23:00:33 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2012-11-30 23:00:33 -0800 |
| commit | 9b35156c927b6085c7fe3796542501a6aa6bcbbd (patch) | |
| tree | 73b62f0e1980226eb2c47d5d8c9136916f95afd1 /grc/python | |
| parent | 1907e670b5c3658a7c76f3f00ba239c95ab18210 (diff) | |
| parent | 6cc818260128df57c51a41e4e6aa459de5faf4fe (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'grc/python')
| -rw-r--r-- | grc/python/Constants.py | 2 | ||||
| -rw-r--r-- | grc/python/Port.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/grc/python/Constants.py b/grc/python/Constants.py index 09c3081967..b8dc9a96a1 100644 --- a/grc/python/Constants.py +++ b/grc/python/Constants.py @@ -58,7 +58,7 @@ CORE_TYPES = ( #name, key, sizeof, color ('Integer 16', 's16', 2, '#FFFF66'), ('Integer 8', 's8', 1, '#FF66FF'), ('Message Queue', 'msg', 0, '#777777'), - ('Async Message', 'message', 0, '#777777'), + ('Async Message', 'message', 0, '#C0C0C0'), ('Wildcard', '', 0, '#FFFFFF'), ) diff --git a/grc/python/Port.py b/grc/python/Port.py index 0e7051c7c0..0703d67627 100644 --- a/grc/python/Port.py +++ b/grc/python/Port.py @@ -118,7 +118,7 @@ class Port(_Port, _GUIPort): _Port.validate(self) if not self.get_enabled_connections() and not self.get_optional(): self.add_error_message('Port is not connected.') - if not self.is_source() and len(self.get_enabled_connections()) > 1: + if not self.is_source() and (not self.get_type() == "message") and len(self.get_enabled_connections()) > 1: self.add_error_message('Port has too many connections.') #message port logic if self.get_type() == 'msg': |