Make FileNameOption behave more like old filenm parser

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

diff --git a/src/gromacs/options/filenameoption.cpp b/src/gromacs/options/filenameoption.cpp
index ae40a3a6cfbe3ebdbda1e1c32fd930ca79ed0065..31dff32dc4e3754f52164d8974e00a8c351c01aa 100644 (file)
--- a/src/gromacs/options/filenameoption.cpp
+++ b/src/gromacs/options/filenameoption.cpp
@@ -273,15 +273,12 @@ FileNameOptionStorage::FileNameOptionStorage(const FileNameOption &settings)
 {
     if (settings.defaultBasename_ != NULL)
     {
+        std::string defaultValue =
+            completeFileName(settings.defaultBasename_, filetype_, false);
+        setDefaultValueIfSet(defaultValue);
         if (isRequired())
         {
-            setDefaultValue(completeFileName(settings.defaultBasename_,
-                                             filetype_, false));
-        }
-        else
-        {
-            setDefaultValueIfSet(completeFileName(settings.defaultBasename_,
-                                                  filetype_, false));
+            setDefaultValue(defaultValue);
         }
     }
 }