Skip to content

Commit

Permalink
Support '.' in output directory path.
Browse files Browse the repository at this point in the history
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).
  • Loading branch information
rcorre committed Sep 13, 2015
1 parent d8ce830 commit fdb2787
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/core/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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" )
{
Expand All @@ -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" )
{
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit fdb2787

Please sign in to comment.