X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/dcbde23605bb045df116a1dd522d4ddb4d9288fa..2cba1186aa3895ab0ca3613d6e1f17854f70a97a:/window.c

diff --git a/window.c b/window.c
index 1568617b..2797c53e 100644
--- a/window.c
+++ b/window.c
@@ -1911,11 +1911,14 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
        }
 #endif
 
+	if (wParam == VK_MENU && (HIWORD(lParam)&KF_EXTENDED)) {
+	    keystate[VK_RMENU] = keystate[VK_MENU];
+	}
+
 	/* Note if AltGr was pressed and if it was used as a compose key */
 	if (cfg.compose_key) {
 	    if (wParam == VK_MENU && (HIWORD(lParam)&KF_EXTENDED))
 	    {
-		keystate[VK_RMENU] = keystate[VK_MENU];
 		if (!compose_state) compose_key = wParam;
 	    }
 	    if (wParam == VK_APPS && !compose_state)
@@ -1932,8 +1935,9 @@ static int TranslateKey(UINT message, WPARAM wParam, LPARAM lParam,
 	    }
 	    else if (compose_state==1 && wParam != VK_CONTROL)
 		compose_state = 0;
-	} else
+	} else {
 	    compose_state = 0;
+	}
 
 	/* Nastyness with NUMLock - Shift-NUMLock is left alone though */
 	if ( (cfg.funky_type == 3 ||