From f8c27feedb3964106e31ddc737412a7b66f05d6d Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Wed, 25 Jan 2012 05:48:53 +0000
Subject: [PATCH] Skip unprocessed key events. Updates #1408.

Originally committed to SVN as r6356.
---
 aegisub/src/audio_display.cpp         | 3 ++-
 aegisub/src/dialog_detached_video.cpp | 3 ++-
 aegisub/src/video_display.cpp         | 3 ++-
 aegisub/src/video_slider.cpp          | 2 ++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/aegisub/src/audio_display.cpp b/aegisub/src/audio_display.cpp
index dd62f5fed..8c379db18 100644
--- a/aegisub/src/audio_display.cpp
+++ b/aegisub/src/audio_display.cpp
@@ -1164,7 +1164,8 @@ void AudioDisplay::OnMouseEvent(wxMouseEvent& event)
 
 void AudioDisplay::OnKeyDown(wxKeyEvent& event)
 {
-	hotkey::check("Audio", context, event.GetKeyCode(), event.GetUnicodeKey(), event.GetModifiers());
+	if (!hotkey::check("Audio", context, event.GetKeyCode(), event.GetUnicodeKey(), event.GetModifiers()))
+		event.Skip();
 }
 
 void AudioDisplay::OnSize(wxSizeEvent &)
diff --git a/aegisub/src/dialog_detached_video.cpp b/aegisub/src/dialog_detached_video.cpp
index c845da8d9..d5a699912 100644
--- a/aegisub/src/dialog_detached_video.cpp
+++ b/aegisub/src/dialog_detached_video.cpp
@@ -120,7 +120,8 @@ void DialogDetachedVideo::OnMinimize(wxIconizeEvent &event) {
 }
 
 void DialogDetachedVideo::OnKeyDown(wxKeyEvent &evt) {
-	hotkey::check("Video Display", context, evt.GetKeyCode(), evt.GetUnicodeKey(), evt.GetModifiers());
+	if (!hotkey::check("Video Display", context, evt.GetKeyCode(), evt.GetUnicodeKey(), evt.GetModifiers()))
+		evt.Skip();
 }
 
 void DialogDetachedVideo::OnVideoOpen() {
diff --git a/aegisub/src/video_display.cpp b/aegisub/src/video_display.cpp
index 5ca577b62..b0650e9f3 100644
--- a/aegisub/src/video_display.cpp
+++ b/aegisub/src/video_display.cpp
@@ -388,7 +388,8 @@ void VideoDisplay::OnContextMenu(wxContextMenuEvent&) {
 }
 
 void VideoDisplay::OnKeyDown(wxKeyEvent &event) {
-	hotkey::check("Video", con, event.GetKeyCode(), event.GetUnicodeKey(), event.GetModifiers());
+	if (!hotkey::check("Video", con, event.GetKeyCode(), event.GetUnicodeKey(), event.GetModifiers()))
+		event.Skip();
 }
 
 void VideoDisplay::SetZoom(double value) {
diff --git a/aegisub/src/video_slider.cpp b/aegisub/src/video_slider.cpp
index 3b17d24ae..89be33383 100644
--- a/aegisub/src/video_slider.cpp
+++ b/aegisub/src/video_slider.cpp
@@ -160,6 +160,8 @@ void VideoSlider::OnKeyDown(wxKeyEvent &event) {
 		c->subsGrid->GetEventHandler()->ProcessEvent(event);
 		c->subsGrid->SetFocus();
 	}
+	else
+		event.Skip();
 }
 
 void VideoSlider::OnPaint(wxPaintEvent &) {