Merge branch release-5-1

[alexxy/gromacs.git] / src / gromacs / options / filenameoptionmanager.cpp

diff --git a/src/gromacs/options/filenameoptionmanager.cpp b/src/gromacs/options/filenameoptionmanager.cpp
index 212c6a26a57be1b917a365ddcb2f60f8f118e6a7..1a627cd85c6d7f550f915cd71458928357855854 100644 (file)
--- 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();
         }