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

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

Author: sagamusix
Date: Fri Mar 15 18:40:00 2024
New Revision: 20364
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20364

Log:
Merged revision(s) 20363 from trunk/OpenMPT:
[Fix] Add missing newline to key config parser error reporting.
[Fix] File sizes in the instrument browser and comments tab were displayed incorrectly if a file size < 1KB ended in 0s.
........

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

Modified: branches/OpenMPT-1.31/mptrack/CommandSet.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/CommandSet.cpp	Fri Mar 15 18:39:38 2024	(r20363)
+++ branches/OpenMPT-1.31/mptrack/CommandSet.cpp	Fri Mar 15 18:40:00 2024	(r20364)
@@ -2101,7 +2101,7 @@
 			keymapVersion = Version::Parse(mpt::ToUnicode(mpt::Charset::ASCII, tokens[1]));
 			if(keymapVersion > Version::Current())
 			{
-				errText += MPT_CFORMAT("Keymap was saved with OpenMPT {}, but you are running OpenMPT {}.")(keymapVersion, Version::Current());
+				errText += MPT_CFORMAT("Keymap was saved with OpenMPT {}, but you are running OpenMPT {}.\n")(keymapVersion, Version::Current());
 			}
 			continue;
 		}

Modified: branches/OpenMPT-1.31/mptrack/Mptrack.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/Mptrack.cpp	Fri Mar 15 18:39:38 2024	(r20363)
+++ branches/OpenMPT-1.31/mptrack/Mptrack.cpp	Fri Mar 15 18:40:00 2024	(r20364)
@@ -2091,7 +2091,10 @@
 			// Variable-length formatting may decide on a whim to switch to scientific formatting, so used a fixed width and trim manually...
 			CString s = mpt::cfmt::fix(size, 2);
 			if(i == 0)
-				s.TrimRight(_T("0."));
+			{
+				if(int pos = s.ReverseFind(_T('.')); pos >= 0)
+					s.Delete(pos, s.GetLength() - pos);
+			}
 			return s + Unit[i];
 		}
 		size /= 1024.0;