X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=blobdiff_plain;f=src%2Fgromacs%2Foptions%2Ffilenameoptionmanager.cpp;h=e33443b8b1e54c4a1f65d8325cac3295f07fb5bf;hb=10a5f4c1192f1b5e7aa59ed4962f7e2d7d5d4c24;hp=4f0767895be9a098fbc822e51808e2b3b130bed1;hpb=90e5c7b64e42dba60be8119a0b1d2e5356673854;p=alexxy%2Fgromacs.git diff --git a/src/gromacs/options/filenameoptionmanager.cpp b/src/gromacs/options/filenameoptionmanager.cpp index 4f0767895b..e33443b8b1 100644 --- a/src/gromacs/options/filenameoptionmanager.cpp +++ b/src/gromacs/options/filenameoptionmanager.cpp @@ -268,15 +268,14 @@ std::string FileNameOptionManager::completeFileName( std::string FileNameOptionManager::completeDefaultFileName( const std::string &prefix, const FileNameOptionInfo &option) { - if (option.isDirectoryOption() || impl_->bInputCheckingDisabled_) + if (option.isDirectoryOption()) { return std::string(); } const bool bInput = option.isInputFile() || option.isInputOutputFile(); const std::string realPrefix = !impl_->defaultFileName_.empty() ? impl_->defaultFileName_ : prefix; - const bool bAllowMissing = option.allowMissing(); - if (bInput) + if (bInput && !impl_->bInputCheckingDisabled_) { const std::string completedName = findExistingExtension(realPrefix, option, impl_->redirector_); @@ -284,7 +283,7 @@ std::string FileNameOptionManager::completeDefaultFileName( { return completedName; } - if (bAllowMissing) + if (option.allowMissing()) { return realPrefix + option.defaultExtension(); }