[OMPT-svn-commit] OpenMPT r21096 - in branches/OpenMPT-1.31: . mptrack

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

Author: sagamusix
Date: Fri Jun 28 22:05:47 2024
New Revision: 21096
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21096

Log:
Merged revision(s) 21095 from trunk/OpenMPT:
[Fix] Sample tab: Don't allow OPL editor to remain focussed when switching to a non-OPL sample slot (https://bugs.openmpt.org/view.php?id=1795).
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/mptrack/View_smp.cpp

Modified: branches/OpenMPT-1.31/mptrack/View_smp.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/View_smp.cpp	Fri Jun 28 22:05:29 2024	(r21095)
+++ branches/OpenMPT-1.31/mptrack/View_smp.cpp	Fri Jun 28 22:05:47 2024	(r21096)
@@ -414,7 +414,10 @@
 	if(!IsOPLInstrument())
 	{
 		if(m_oplEditor)
+		{
 			m_oplEditor->ShowWindow(SW_HIDE);
+			m_oplEditor->EnableWindow(FALSE);
+		}
 		return;
 	}
 	CSoundFile &sndFile = GetDocument()->GetSoundFile();
@@ -434,6 +437,7 @@
 		if(m_oplEditor)
 		{
 			m_oplEditor->SetPatch(sample.adlib);
+			m_oplEditor->EnableWindow(TRUE);
 			auto size = m_oplEditor->GetMinimumSize();
 			m_oplEditor->SetWindowPos(nullptr, -m_nScrollPosX, -m_nScrollPosY, std::max(size.cx, m_rcClient.right), std::max(size.cy, m_rcClient.bottom), SWP_NOZORDER | SWP_NOACTIVATE | SWP_SHOWWINDOW);
 		}