This commit is contained in:
Robin Mills 2015-08-26 13:34:55 +00:00
parent b030a4de7c
commit ccb462869f

View File

@ -2025,9 +2025,11 @@ namespace {
{
std::string directory = Params::instance().directory_;
if (directory.empty()) directory = Util::dirname(path);
std::string newPath = directory + EXV_SEPARATOR_STR
+ Util::basename(path, true) + ext;
return newPath;
directory = Exiv2::fileProtocol(path) == Exiv2::pFile
? directory + EXV_SEPARATOR_STR
: "" // use current directory for remote files
;
return directory + Util::basename(path, true) + ext;
}
int dontOverwrite(const std::string& path)