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

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

Author: sagamusix
Date: Tue Mar  5 19:27:08 2024
New Revision: 20251
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20251

Log:
[Mod] Pattern tab: Also abort merge operation if pattern lengths wouldn't change after the user chose a custom pattern length.

Modified:
   trunk/OpenMPT/mptrack/Ctrl_pat.cpp

Modified: trunk/OpenMPT/mptrack/Ctrl_pat.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Ctrl_pat.cpp	Tue Mar  5 11:52:24 2024	(r20250)
+++ trunk/OpenMPT/mptrack/Ctrl_pat.cpp	Tue Mar  5 19:27:08 2024	(r20251)
@@ -939,7 +939,8 @@
 			return;
 		}
 		patternSize = static_cast<ROWINDEX>(dlg.resultAsInt);
-	} else if(minPatternSize == maxPatternSize && minPatternSize == patternSize)
+	}
+	if(minPatternSize == maxPatternSize && minPatternSize == patternSize)
 	{
 		MessageBeep(MB_ICONWARNING);
 		SwitchToView();