From 00c819c0d5e2e64717d6c7968f477cb4642a94d5 Mon Sep 17 00:00:00 2001
From: matthijs <matthijs@openttd.org>
Date: Mon, 4 Apr 2005 16:47:03 +0000
Subject: (svn r2146) - Fix: [ 1175973 ] Crash if any key is pressed in startup
 (pkirchhofer)

---
 window.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'window.c')

diff --git a/window.c b/window.c
index b9d46a53a..becc44d11 100644
--- a/window.c
+++ b/window.c
@@ -1280,8 +1280,11 @@ static void HandleKeypress(uint32 key)
 			break;
 	}
 
-	if (we.keypress.cont)
-		FindWindowById(WC_MAIN_TOOLBAR, 0)->wndproc(w, &we);
+	if (we.keypress.cont) {
+		w = FindWindowById(WC_MAIN_TOOLBAR, 0);
+		// When there is no toolbar w is null, check for that
+		if (w != NULL) w->wndproc(w, &we);
+	}
 }
 
 extern void UpdateTileSelection(void);
-- 
cgit v1.2.3-54-g00ecf