[OMPT-svn-commit] OpenMPT r21210 - in branches/OpenMPT-1.31: . libopenmpt/xmp-openmpt

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

Author: sagamusix
Date: Sun Jul 21 01:13:33 2024
New Revision: 21210
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21210

Log:
Merged revision(s) 21209 from trunk/OpenMPT:
[Fix] xmp-openmpt: Sanitize sample / instrument names to avoid line breaks.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/libopenmpt/xmp-openmpt/xmp-openmpt.cpp

Modified: branches/OpenMPT-1.31/libopenmpt/xmp-openmpt/xmp-openmpt.cpp
==============================================================================
--- branches/OpenMPT-1.31/libopenmpt/xmp-openmpt/xmp-openmpt.cpp	Sun Jul 21 01:13:12 2024	(r21209)
+++ branches/OpenMPT-1.31/libopenmpt/xmp-openmpt/xmp-openmpt.cpp	Sun Jul 21 01:13:33 2024	(r21210)
@@ -1233,7 +1233,7 @@
 		}
 		str << title << " Names:" << "\r";
 		for ( std::size_t i = 0; i < names.size(); i++ ) {
-			str << std::setfill('0') << std::setw(2) << (display_offset + i) << std::setw(0) << "\t" << convert_to_native( names[i] ) << "\r";
+			str << std::setfill( '0' ) << std::setw( 2 ) << ( display_offset + i ) << std::setw( 0 ) << "\t" << convert_to_native( sanitize_xmplay_info_string( names[i] ) ) << "\r";
 		}
 		str << "\r";
 	}