Commit 93947151 authored by bitplane's avatar bitplane

Fix for [2003232] EET_KEY_INPUT_EVENT send twice when an element is focused, by CuteAlien

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1554 dfc29bdd-3216-0410-991c-e03cc46cb475
parent e3fd0142
...@@ -367,8 +367,10 @@ void CGUIEnvironment::clear() ...@@ -367,8 +367,10 @@ void CGUIEnvironment::clear()
bool CGUIEnvironment::OnEvent(const SEvent& event) bool CGUIEnvironment::OnEvent(const SEvent& event)
{ {
bool ret = false; bool ret = false;
if (UserReceiver && (event.EventType != EET_MOUSE_INPUT_EVENT) && if (UserReceiver
(event.EventType != EET_GUI_EVENT || event.GUIEvent.Caller != this)) && (event.EventType != EET_MOUSE_INPUT_EVENT)
&& (event.EventType != EET_KEY_INPUT_EVENT)
&& (event.EventType != EET_GUI_EVENT || event.GUIEvent.Caller != this))
{ {
ret = UserReceiver->OnEvent(event); ret = UserReceiver->OnEvent(event);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment