diff options
author | Daniel Drake <dsd@laptop.org> | 2012-11-23 19:05:55 (GMT) |
---|---|---|
committer | Daniel Drake <dsd@laptop.org> | 2012-11-23 19:05:55 (GMT) |
commit | 309a97082b58b86ffa06cff4241fff72ba52bf74 (patch) | |
tree | a55d28d2b7f73443c580ca3668326d8557d89651 /record.py | |
parent | a31fa4f058cfcc368ab0d7cfd3a9fd0fdb6b41ff (diff) |
Allow O game-key to be used to stop recording
A regression over old versions is that the O game key can be used
to start recording video/audio, but not stop it. Fix that.
Diffstat (limited to 'record.py')
-rw-r--r-- | record.py | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -239,9 +239,6 @@ class Record(activity.Activity): self._toolbar_controls.set_quality(data.get('quality', 0)) def _key_pressed(self, widget, event): - if self.model.ui_frozen(): - return False - key = event.keyval if key == gtk.keysyms.KP_Page_Up: # game key O @@ -250,7 +247,11 @@ class Record(activity.Activity): self._shutter_button.clicked() else: # return to live mode self.model.set_state(constants.STATE_READY) - elif key == gtk.keysyms.c and event.state == gdk.CONTROL_MASK: + + if self.model.ui_frozen(): + return False + + if key == gtk.keysyms.c and event.state == gdk.CONTROL_MASK: self._copy_to_clipboard(self._active_recd) elif key == gtk.keysyms.i: self._toggle_info() |