From 397d1186d731a62ffa39a315f13cbafabee75324 Mon Sep 17 00:00:00 2001 From: frosch Date: Sun, 4 Jul 2010 09:27:15 +0000 Subject: (svn r20071) -Codechange: Consistently return the toolbar window for ShowBuildXxxToolbar(). --- src/terraform_gui.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/terraform_gui.cpp') diff --git a/src/terraform_gui.cpp b/src/terraform_gui.cpp index 7d708c2fe..cc4e58e73 100644 --- a/src/terraform_gui.cpp +++ b/src/terraform_gui.cpp @@ -360,6 +360,7 @@ EventState TerraformToolbarGlobalHotkeys(uint16 key, uint16 keycode) int num = CheckHotkeyMatch(_terraform_hotkeys, keycode, NULL, true); if (num == -1) return ES_NOT_HANDLED; Window *w = ShowTerraformToolbar(NULL); + if (w == NULL) return ES_NOT_HANDLED; return w->OnKeyPress(key, keycode); } @@ -769,5 +770,6 @@ EventState TerraformToolbarEditorGlobalHotkeys(uint16 key, uint16 keycode) int num = CheckHotkeyMatch(_terraform_editor_hotkeys, keycode, NULL, true); if (num == -1) return ES_NOT_HANDLED; Window *w = ShowEditorTerraformToolbar(); + if (w == NULL) return ES_NOT_HANDLED; return w->OnKeyPress(key, keycode); } -- cgit v1.2.3-54-g00ecf