[OMPT-svn-commit] OpenMPT r22399 - in branches/OpenMPT-1.28: . soundlib

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

Author: sagamusix
Date: Sun Dec  1 13:09:20 2024
New Revision: 22399
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22399

Log:
Merged revision(s) 22398 from branches/OpenMPT-1.29:
[Fix] Fix compilation.
........

Modified:
   branches/OpenMPT-1.28/   (props changed)
   branches/OpenMPT-1.28/soundlib/Load_mod.cpp

Modified: branches/OpenMPT-1.28/soundlib/Load_mod.cpp
==============================================================================
--- branches/OpenMPT-1.28/soundlib/Load_mod.cpp	Sun Dec  1 13:08:43 2024	(r22398)
+++ branches/OpenMPT-1.28/soundlib/Load_mod.cpp	Sun Dec  1 13:09:20 2024	(r22399)
@@ -1249,9 +1249,9 @@
 				{
 #ifdef MPT_EXTERNAL_SAMPLES
 					mpt::ustring filenameHint;
-					if(file.GetOptionalFileName())
+					if(!file.GetFileName().empty())
 					{
-						const auto filename = file.GetOptionalFileName()->GetFilename().ToUnicode();
+						const auto filename = file.GetFileName().GetFilename().ToUnicode();
 						filenameHint = mpt::format(U_(" ({}.nt or {}.as)"))(filename, filename);
 					}
 					AddToLog(LogWarning, mpt::format(U_("This Startrekker AM file is most likely missing its companion file{}. Synthesized instruments will not play."))(filenameHint));