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

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

Author: sagamusix
Date: Tue Nov 26 19:34:14 2024
New Revision: 22315
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22315

Log:
[Fix] Don't send keyboard shortcut messages intended for MDI views to the view if another dialog currently has focus.

Modified:
   trunk/OpenMPT/mptrack/MainFrm.cpp

Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp	Tue Nov 26 09:13:10 2024	(r22314)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp	Tue Nov 26 19:34:14 2024	(r22315)
@@ -2720,6 +2720,7 @@
 
 		default:
 			// If handled neither by MainFrame nor by ModDoc, send it to the active view
+			// Note: MDIGetActive() will return a valid view even if we are currently in a modal dialog!
 			CMDIChildWnd *pMDIActive = MDIGetActive();
 			CWnd *wnd = nullptr;
 			if(pMDIActive)
@@ -2733,12 +2734,12 @@
 			}
 
 			// Backup solution for order navigation if the currently active view is not a pattern view, but a module is playing
+			// Note: This should also work if the currently active window is not a CMDIChildWnd, hence it happens before the GetActiveWindow() check.
 			if(mpt::is_in_range(cmd, kcPrevNextOrderStart, kcPrevNextOrderEnd)
 				&& m_pSndFile && m_pSndFile->GetpModDoc()
 				&& wnd != nullptr
 				&& strcmp(wnd->GetRuntimeClass()->m_lpszClassName, "CViewPattern"))
 			{
-				ResetNotificationBuffer();
 				CriticalSection cs;
 
 				ORDERINDEX order = m_pSndFile->m_PlayState.m_nCurrentOrder;
@@ -2747,6 +2748,10 @@
 				else
 					order = m_pSndFile->Order().GetNextOrderIgnoringSkips(order);
 				
+				if(order == m_pSndFile->m_PlayState.m_nCurrentOrder)
+					return wParam;
+
+				ResetNotificationBuffer();
 				switch(wParam)
 				{
 				case kcPrevOrder:
@@ -2769,9 +2774,10 @@
 					m_pSndFile->m_PlayState.m_nSeqOverride = order;
 					break;
 				}
+				return wParam;
 			}
 
-			if(wnd)
+			if(wnd && GetActiveWindow() == this)
 				return wnd->SendMessage(WM_MOD_KEYCOMMAND, wParam, lParam);
 			return kcNull;
 	}