Merge pull request #207 from cortex-command-community/input-handling-refactor

Fix TextInput use after free during activity

Author: Causeless

Source/GUI/GUITextPanel.cpp

@@ -141,10 +141,12 @@ void GUITextPanel::Draw(GUIScreen* Screen) {
 }
 
 void GUITextPanel::OnGainFocus() {
+	GUIPanel::OnGainFocus();
 	m_Manager->GetInputController()->StartTextInput();
 }
 
 void GUITextPanel::OnLoseFocus() {
+	GUIPanel::OnLoseFocus();
 	m_Manager->GetInputController()->StopTextInput();
 }
 

Source/Main.cpp

@@ -229,7 +229,7 @@ void PollSDLEvents() {
 			case SDL_EVENT_JOYSTICK_BUTTON_UP :
 			case SDL_EVENT_JOYSTICK_ADDED :
 			case SDL_EVENT_JOYSTICK_REMOVED :
-				g_UInputMan.QueueInputEvent(sdlEvent);
+				g_UInputMan.HandleInputEvent(sdlEvent);
 				break;
 			default:
 				break;
@@ -273,6 +273,7 @@ void RunMenuLoop() {
 		}
 		g_ConsoleMan.Update();
 
+		g_UInputMan.EndFrame();
 		g_WindowMan.GetScreenBuffer()->Begin();
 		g_MenuMan.Draw();
 		g_ConsoleMan.Draw(g_FrameMan.GetBackBuffer32());
@@ -358,6 +359,7 @@ void RunGameLoop() {
 			g_PresetMan.ClearReloadEntityPresetCalledThisUpdate();
 
 			g_PerformanceMan.StopPerformanceMeasurement(PerformanceMan::SimTotal);
+			g_UInputMan.EndFrame();
 
 			if (!g_ActivityMan.IsInActivity()) {
 				g_TimerMan.PauseSim(true);
@@ -379,6 +381,7 @@ void RunGameLoop() {
 				g_PerformanceMan.ResetSimUpdateTimer();
 				updateStartTime = g_TimerMan.GetAbsoluteTime();
 			}
+
 		}
 
 		updateEndAndDrawStartTime = g_TimerMan.GetAbsoluteTime();

Source/Managers/ConsoleMan.cpp

@@ -295,8 +295,10 @@ void ConsoleMan::Update() {
 	}
 
 	if (!m_ReadOnly) {
-		m_InputTextBox->SetEnabled(true);
-		m_InputTextBox->SetFocus();
+		if (!m_InputTextBox->GetEnabled() || !m_InputTextBox->HasFocus()) {
+			m_InputTextBox->SetEnabled(true);
+			m_InputTextBox->SetFocus();
+		}
 
 		if (!m_InputLog.empty() && !g_UInputMan.FlagCtrlState()) {
 			if (g_UInputMan.KeyPressed(SDLK_UP)) {