hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Support '.' in output directory path.

Browse Source 
Do not call baseName on the path passed to -o when using the --rendertracks
option. This was mangling directories that contained a literal '.' if a '/' was
not explicitly specified at the end.

Still call baseName for --render as the argument to -o is a file and we need to
set the extension (ogg/wav).
This commit is contained in:
Ryan Roden-Corrent
2015-09-13 12:51:02 -04:00
parent d8ce8301b8
commit fdb2787ff9
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/main.cpp
View File

@@ -311,7 +311,7 @@ int main( int argc, char * * argv )
fileToLoad = QString::fromLocal8Bit( argv[i] );
renderOut = baseName( fileToLoad );
renderOut = fileToLoad;
}
else if( arg == "--loop" || arg == "-l" )
{
@@ -329,7 +329,7 @@ int main( int argc, char * * argv )
}
renderOut = baseName( QString::fromLocal8Bit( argv[i] ) );
renderOut = QString::fromLocal8Bit( argv[i] );
}
else if( arg == "--format" || arg == "-f" )
{
@@ -602,7 +602,8 @@ int main( int argc, char * * argv )
// otherwise, it is a file, so we need to append the file extension
if ( !renderTracks )
{
renderOut = renderOut + ProjectRenderer::getFileExtensionFromFormat(eff);
renderOut = baseName( renderOut ) +
ProjectRenderer::getFileExtensionFromFormat(eff);
}
// create renderer