From 463b96a746a74830c49fcc0b84be0df125c7e469 Mon Sep 17 00:00:00 2001
From: rubidium <rubidium@openttd.org>
Date: Mon, 13 Jul 2009 16:41:34 +0000
Subject: [PATCH] (svn r16815) -Fix: reduce the toolbar's priority for handling
 keypresses from most important to least important, so e.g. the order windows'
 'd' skips to the next order

---
 src/window.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/window.cpp b/src/window.cpp
index f46bf08dae..ba360beea6 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -1992,9 +1992,10 @@ void HandleKeypress(uint32 raw_key)
 		if (_focused_window->OnKeyPress(key, keycode) == Window::ES_HANDLED) return;
 	}
 
-	/* Call the event, start with the uppermost window. */
+	/* Call the event, start with the uppermost window, but ignore the toolbar. */
 	Window *w;
 	FOR_ALL_WINDOWS_FROM_FRONT(w) {
+		if (w->window_class == WC_MAIN_TOOLBAR) continue;
 		if (w->OnKeyPress(key, keycode) == Window::ES_HANDLED) return;
 	}