Author: sagamusix
Date: Fri May 31 23:35:13 2024
New Revision: 20888
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20888
Log:
[Fix] General tabs: Updates received from other views could cause unintended data changes (e.g. truncating fractional tempo if it is technically unsupported by current format).
Modified:
trunk/OpenMPT/mptrack/Ctrl_com.cpp
trunk/OpenMPT/mptrack/Ctrl_gen.cpp
Modified: trunk/OpenMPT/mptrack/Ctrl_com.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Ctrl_com.cpp Fri May 31 21:35:16 2024 (r20887)
+++ trunk/OpenMPT/mptrack/Ctrl_com.cpp Fri May 31 23:35:13 2024 (r20888)
@@ -127,8 +127,8 @@
{
CommentHint commentHint = hint.ToType<CommentHint>();
if (pHint == this || !commentHint.GetType()[HINT_MODCOMMENTS | HINT_MPTOPTIONS | HINT_MODTYPE]) return;
- if (m_nLockCount) return;
- m_nLockCount++;
+ if (IsLocked()) return;
+ LockControls();
static FontSetting previousFont;
FontSetting font = TrackerSettings::Instance().commentsFont;
@@ -180,7 +180,7 @@
}
m_EditComments.SetRedraw(TRUE);
- m_nLockCount--;
+ UnlockControls();
}
Modified: trunk/OpenMPT/mptrack/Ctrl_gen.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Ctrl_gen.cpp Fri May 31 21:35:16 2024 (r20887)
+++ trunk/OpenMPT/mptrack/Ctrl_gen.cpp Fri May 31 23:35:13 2024 (r20888)
@@ -260,6 +260,7 @@
const auto resamplingModes = Resampling::AllModes();
+ LockControls();
if (hintType == HINT_MPTOPTIONS || updateAll)
{
CString defaultResampler;
@@ -394,6 +395,7 @@
m_VuMeterLeft.InvalidateRect(NULL, FALSE);
m_VuMeterRight.InvalidateRect(NULL, FALSE);
}
+ UnlockControls();
}
|
