diff options
| author | Tom Rondeau | 2011-05-08 19:58:43 +0100 |
|---|---|---|
| committer | Tom Rondeau | 2011-05-08 19:58:43 +0100 |
| commit | a72bde633dda63c4471111894ca6b92a87318d5f (patch) | |
| tree | c60e447e922b1a7076dd839ed8a94fcc9b665919 /grc/gui/ActionHandler.py | |
| parent | bdd0bd405c2ea645395917c1abb91c964210c4d9 (diff) | |
| parent | 207a2ae73bd5d6cab201bb57ed8db64fd54cfd90 (diff) | |
| download | gnuradio-a72bde633dda63c4471111894ca6b92a87318d5f.tar.gz gnuradio-a72bde633dda63c4471111894ca6b92a87318d5f.tar.bz2 gnuradio-a72bde633dda63c4471111894ca6b92a87318d5f.zip | |
Merge branch 'master' into 8psk
Diffstat (limited to 'grc/gui/ActionHandler.py')
| -rw-r--r-- | grc/gui/ActionHandler.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/grc/gui/ActionHandler.py b/grc/gui/ActionHandler.py index 350b297bb..15785f2ee 100644 --- a/grc/gui/ActionHandler.py +++ b/grc/gui/ActionHandler.py @@ -1,5 +1,5 @@ """ -Copyright 2007, 2008, 2009, 2011 Free Software Foundation, Inc. +Copyright 2007-2011 Free Software Foundation, Inc. This file is part of GNU Radio GNU Radio Companion is free software; you can redistribute it and/or @@ -78,8 +78,7 @@ class ActionHandler: When not in focus, gtk and the accelerators handle the the key press. @return false to let gtk handle the key action """ - try: assert self.get_focus_flag() - except AssertionError: return False + if not self.get_focus_flag(): return False return Actions.handle_key_press(event) def _quit(self, window, event): |