[OMPT-svn-commit] OpenMPT r21652 - trunk/OpenMPT/mptrack

[<sv...@op...>]

Author: sagamusix
Date: Fri Sep 20 13:54:03 2024
New Revision: 21652
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21652

Log:
[Ref] Reuse GetModifierMask() result.

Modified:
   trunk/OpenMPT/mptrack/InputHandler.cpp

Modified: trunk/OpenMPT/mptrack/InputHandler.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/InputHandler.cpp	Fri Sep 20 13:35:30 2024	(r21651)
+++ trunk/OpenMPT/mptrack/InputHandler.cpp	Fri Sep 20 13:54:03 2024	(r21652)
@@ -559,20 +559,21 @@
 		return false;
 
 	// Alpha-numerics (only shift or no modifier):
-	if(!GetModifierMask().test_any_except(ModShift))
+	const auto modifierMask = GetModifierMask();
+	if(!modifierMask.test_any_except(ModShift))
 	{
 		if((key >= 'A' && key <= 'Z') || (key >= '0' && key <= '9')
 		   || (key >= VK_MULTIPLY && key <= VK_DIVIDE) || key == VK_SPACE || key == VK_CAPITAL
 		   || (key >= VK_OEM_1 && key <= VK_OEM_3) || (key >= VK_OEM_4 && key <= VK_OEM_8))
 			return true;
-		if((key >= VK_NUMPAD0 && key <= VK_NUMPAD9) && GetModifierMask() == ModNone)
+		if((key >= VK_NUMPAD0 && key <= VK_NUMPAD9) && modifierMask == ModNone)
 			return true;
 		if(key == VK_RETURN && (GetWindowLong(hWnd, GWL_STYLE) & ES_MULTILINE))
 			return true;
 	}
 
 	// Navigation (any modifier except Alt without any other modifiers):
-	if(GetModifierMask() != ModAlt)
+	if(modifierMask != ModAlt)
 	{
 		if(key == VK_LEFT || key == VK_RIGHT || key == VK_UP || key == VK_DOWN
 		   || key == VK_HOME || key == VK_END || key == VK_DELETE || key == VK_INSERT || key == VK_BACK)
@@ -580,7 +581,7 @@
 	}
 
 	// Copy paste etc..
-	if(GetModifierMask() == ModCtrl)
+	if(modifierMask == ModCtrl)
 	{
 		if(key == 'Y' || key == 'Z' || key == 'X' ||  key == 'C' || key == 'V' || key == 'A')
 			return true;