Made input callbacks lock during transitions and lockinput.

2014-12-10 13:38:10 -07:00
parent c9a17dc48e
commit 6f8b5f2477
3 changed files with 4 additions and 1 deletions
@@ -304,7 +304,8 @@ void Screen::ClearMessageQueue( const ScreenMessage SM )

 bool Screen::PassInputToLua(const InputEventPlus& input)
 {
-	if(m_InputCallbacks.empty())
+	if(m_InputCallbacks.empty() || m_fLockInputSecs > 0.0f
+		|| !AllowCallbackInput())
 	{
 		return false;
 	}