Fix "Capitalize DWI, no SM": m_sSongFileName was not set correctly
if a DWI extension wasn't lower-case.
This commit is contained in:
@@ -437,9 +437,7 @@ bool Song::LoadFromSongDir( CString sDir )
|
|||||||
else {
|
else {
|
||||||
GetDirListing( m_sSongDir+"*.dwi", asFileNames );
|
GetDirListing( m_sSongDir+"*.dwi", asFileNames );
|
||||||
if( !asFileNames.empty() ) {
|
if( !asFileNames.empty() ) {
|
||||||
m_sSongFileName += asFileNames[0];
|
m_sSongFileName += SetExtension( asFileNames[0], "sm" );
|
||||||
/* XXX: This would mess up "vote.for.dwight.d.eisenhower.dwi". */
|
|
||||||
m_sSongFileName.Replace( ".dwi", ".sm" );
|
|
||||||
} else {
|
} else {
|
||||||
m_sSongFileName += sDirectoryParts[sDirectoryParts.size()-2]; // last item
|
m_sSongFileName += sDirectoryParts[sDirectoryParts.size()-2]; // last item
|
||||||
m_sSongFileName += ".sm";
|
m_sSongFileName += ".sm";
|
||||||
@@ -1052,8 +1050,7 @@ void Song::SaveToDWIFile()
|
|||||||
{
|
{
|
||||||
LOG->Trace( "Song::SaveToSongFileAndDWI()" );
|
LOG->Trace( "Song::SaveToSongFileAndDWI()" );
|
||||||
|
|
||||||
CString sPath = GetSongFilePath();
|
CString sPath = SetExtension( GetSongFilePath(), "dwi" );
|
||||||
sPath.Replace( ".sm", ".dwi" );
|
|
||||||
|
|
||||||
NotesWriterDWI wr;
|
NotesWriterDWI wr;
|
||||||
wr.Write(sPath, *this);
|
wr.Write(sPath, *this);
|
||||||
|
|||||||
Reference in New Issue
Block a user