Replicated in Generals.

Author: Caball009

Generals/Code/GameEngine/Include/GameClient/Keyboard.h

@@ -119,6 +119,8 @@ class Keyboard : public SubsystemInterface
 	WideChar translateKey( WideChar keyCode );		///< translate key code to printable UNICODE char
 	WideChar getPrintableKey( KeyDefType key, Int state );
 	enum { MAX_KEY_STATES = 3};
+private:
+	void refreshAltKeys() const;									///< refresh the state of the alt keys, necessary after alt tab
 protected:
 
 	/** get the key data for a single key, KEY_NONE should be returned when

Generals/Code/GameEngine/Source/GameClient/Input/Keyboard.cpp

@@ -748,6 +748,10 @@ void Keyboard::update( void )
 void Keyboard::resetKeys( void )
 {
 
+	// TheSuperHackers @fix Caball009 13/12/2025 Fix bug where game remains in waypoint mode
+	// because the key up state for the alt key is not detected after alt tab.
+	refreshAltKeys();
+
 	memset( m_keys, 0, sizeof( m_keys ) );
 	memset( m_keyStatus, 0, sizeof( m_keyStatus ) );
 	m_modifiers = KEY_STATE_NONE;
@@ -758,6 +762,25 @@ void Keyboard::resetKeys( void )
 
 }
 
+//-------------------------------------------------------------------------------------------------
+// Refresh the state of the alt keys, necessary after alt tab
+//-------------------------------------------------------------------------------------------------
+void Keyboard::refreshAltKeys() const
+{
+	if (BitIsSet(m_keyStatus[KEY_LALT].state, KEY_STATE_DOWN))
+	{
+		GameMessage* msg = TheMessageStream->appendMessage(GameMessage::MSG_RAW_KEY_UP);
+		msg->appendIntegerArgument(KEY_LALT);
+		msg->appendIntegerArgument(KEY_STATE_UP);
+	}
+	if (BitIsSet(m_keyStatus[KEY_RALT].state, KEY_STATE_DOWN))
+	{
+		GameMessage* msg = TheMessageStream->appendMessage(GameMessage::MSG_RAW_KEY_UP);
+		msg->appendIntegerArgument(KEY_RALT);
+		msg->appendIntegerArgument(KEY_STATE_UP);
+	}
+}
+
 //-------------------------------------------------------------------------------------------------
 /** get the first key in our current state of the keyboard */
 //-------------------------------------------------------------------------------------------------

Generals/Code/Main/WinMain.cpp

@@ -401,7 +401,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 				// reset the state of our keyboard cause we haven't been paying
 				// attention to the keys while focus was away
 				//
-				if( TheKeyboard )
+				if (TheKeyboard)
 					TheKeyboard->resetKeys();
 
 				if (TheMouse)
@@ -413,7 +413,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT message,
 			//-------------------------------------------------------------------------
 			case WM_KILLFOCUS:
 			{
-				if (TheKeyboard )
+				if (TheKeyboard)
 					TheKeyboard->resetKeys();
 
 				if (TheMouse)