Override defaults flags only if default flags have been set

Author: NlightNFotis

src/cbmc/cbmc_parse_options.cpp

@@ -325,10 +325,11 @@ void cbmc_parse_optionst::get_command_line_options(optionst &options)
   // Enable flags that in combination provide analysis with no surprises
   // (expected checks and no unsoundness by missing checks).
   if (!cmdline.isset("no-standard-checks") && options.get_bool_option("standard-checks"))
+  {
     set_default_analysis_flags(options);
-
-  PARSE_OPTIONS_GOTO_CHECK_DEFAULTS_OVERRIDE(cmdline, options);
-
+    PARSE_OPTIONS_GOTO_CHECK_DEFAULTS_OVERRIDE(cmdline, options);
+  }
+  
   // all (non-default) checks supported by goto_check
   PARSE_OPTIONS_GOTO_CHECK(cmdline, options);